Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/items

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/items/MultiStateEngine.cc (modified) (2 diffs)

code/branches/questsystem5/src/orxonox/objects/items/MultiStateEngine.cc

@@ -30 +30 @@
 #include "MultiStateEngine.h"
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -123 +123 @@
             }
 
-            if (GameMode::isMaster())
+            if (Core::isMaster())
             {
                 for (std::list<WorldEntity*>::const_iterator it = this->activeEffects_.begin(); it != this->activeEffects_.end(); ++it)