Changeset 7788 for code/branches/presentation2/src/modules

Timestamp:

Dec 21, 2010, 6:09:09 PM (14 years ago)

Author:

scheusso

Message:

merged network5 into presentation2 branch (untested)

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/modules/weapons/MuzzleFlash.cc (modified) (1 diff)

code/branches/presentation2/src/modules/weapons/MuzzleFlash.cc

@@ -42 +42 @@
         this->setScale(0.1f);
 
-        this->delayTimer_.setTimer(0.1f, false, createExecutor(createFunctor(&MuzzleFlash::destroy, this)));
+        if( GameMode::isMaster() )
+          this->delayTimer_.setTimer(0.1f, false, createExecutor(createFunctor(&MuzzleFlash::destroy, this)));
     }
 }