Changeset 2422 for code/branches/objecthierarchy2/src/orxonox/objects/worldentities/MovableEntity.cc

Timestamp:

Dec 13, 2008, 2:55:13 PM (15 years ago)

Author:

landauf

Message:

• deatheffect (explosion) of Pawns works on client and server (creator of the effects can't be the Pawn itself because it will be destroyed on the client before synchronizing the effects)
• fixed a small initialization error in Shader
• fixed a bug in the resynchronization of already deleted MovableEntities
• ExplosionChunk only recalculates it's velocity on the Master

File:

• code/branches/objecthierarchy2/src/orxonox/objects/worldentities/MovableEntity.cc (modified) (2 diffs)

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -33 +33 @@
 #include "core/XMLPort.h"
 #include "core/Executor.h"
-#include "tools/Timer.h"
 
 namespace orxonox
@@ -112 +111 @@
     void MovableEntity::clientConnected(unsigned int clientID)
     {
-        new Timer<MovableEntity>(rnd() * MAX_RESYNCHRONIZE_TIME, false, this, createExecutor(createFunctor(&MovableEntity::resynchronize)), true);
+        this->resynchronizeTimer_.setTimer(rnd() * MAX_RESYNCHRONIZE_TIME, false, this, createExecutor(createFunctor(&MovableEntity::resynchronize)));
     }