Changeset 2848 for code/branches/gui/src/orxonox/gamestates/GSRoot.cc

Timestamp:

Mar 25, 2009, 7:37:00 PM (15 years ago)

Author:

rgrieder

Message:

Exported showsGraphics, etc. to a new class named GameMode in the core.

File:

• code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified) (4 diffs)

code/branches/gui/src/orxonox/gamestates/GSRoot.cc

@@ -33 +33 @@
 #include "util/Debug.h"
 #include "core/Clock.h"
-#include "core/Core.h"
+#include "core/Game.h"
+#include "core/GameMode.h"
 #include "core/CommandLine.h"
 #include "core/ConsoleCommand.h"
@@ -39 +40 @@
 #include "tools/Timer.h"
 #include "objects/Tickable.h"
-#include "core/Game.h"
 
 namespace orxonox
@@ -142 +142 @@
     void GSRoot::setTimeFactor(float factor)
     {
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             if (!this->bPaused_)
@@ -160 +160 @@
     void GSRoot::pause()
     {
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             if (!this->bPaused_)