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

Timestamp:

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

Author:

rgrieder

Message:

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

File:

• code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) (8 diffs)

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

@@ -39 +39 @@
 #include "core/CommandLine.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
-#include "core/Core.h"
+#include "core/Game.h"
+#include "core/GameMode.h"
 #include "objects/Tickable.h"
 #include "objects/Radar.h"
@@ -47 +49 @@
 #include "LevelManager.h"
 #include "PlayerManager.h"
-#include "core/Game.h"
 
 namespace orxonox
@@ -83 +84 @@
         setConfigValues();
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("game");
@@ -99 +100 @@
         this->playerManager_ = new PlayerManager();
 
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             // create the global LevelManager
@@ -107 +108 @@
         }
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             // TODO: insert slomo console command with
@@ -149 +150 @@
         //Loader::close();
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
             InputManager::getInstance().requestLeaveState("game");
 
-        if (Core::isMaster())
+        if (GameMode::isMaster())
             this->unloadLevel();
 
@@ -179 +180 @@
         }
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             inputState_->setHandler(0);
@@ -240 +241 @@
     void GSLevel::keybindInternal(const std::string& command, bool bTemporary)
     {
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             static std::string bindingString = "";