[Orxonox-commit 2631] r7336 - code/branches/network3/src/modules/weapons

[scheusso at orxonox.net]

Author: scheusso
Date: 2010-09-03 15:45:59 +0200 (Fri, 03 Sep 2010)
New Revision: 7336

Modified:
   code/branches/network3/src/modules/weapons/MuzzleFlash.cc
Log:
please only destroy objects (created by the Master and synchronised) on the Master (not on the clients, as this causes inconsistencies)


Modified: code/branches/network3/src/modules/weapons/MuzzleFlash.cc
===================================================================
--- code/branches/network3/src/modules/weapons/MuzzleFlash.cc	2010-09-03 11:30:59 UTC (rev 7335)
+++ code/branches/network3/src/modules/weapons/MuzzleFlash.cc	2010-09-03 13:45:59 UTC (rev 7336)
@@ -41,6 +41,7 @@
         RegisterObject(MuzzleFlash);
         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)));
     }
 }