Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/worldentities/MovableEntity.cc

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/MovableEntity.cc (modified) (2 diffs)

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

@@ -34 +34 @@
 #include "core/XMLPort.h"
 #include "core/Executor.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 
 namespace orxonox
@@ -89 +89 @@
     void MovableEntity::resynchronize()
     {
-        if (GameMode::isMaster() && !this->continuousResynchroTimer_)
+        if (Core::isMaster() && !this->continuousResynchroTimer_)
         {
             // Resynchronise every few seconds because we only work with velocities (no positions)