Changeset 1949 for code/branches/objecthierarchy/src/orxonox/gamestates

Timestamp:

Oct 19, 2008, 2:24:33 PM (16 years ago)

Author:

rgrieder

Message:

Moved all showsGraphics, hasServer, etc. functions from Settings class to Core class.
This was necessary to avoid circular dependencies.

Location:

code/branches/objecthierarchy/src/orxonox/gamestates

Files:

• GSClient.cc (modified) (3 diffs)
• GSDedicated.cc (modified) (3 diffs)
• GSGraphics.cc (modified) (3 diffs)
• GSLevel.cc (modified) (1 diff)
• GSServer.cc (modified) (3 diffs)
• GSStandalone.cc (modified) (3 diffs)

code/branches/objecthierarchy/src/orxonox/gamestates/GSClient.cc

@@ -32 +32 @@
 #include "core/input/InputManager.h"
 #include "core/CommandLine.h"
+#include "core/Core.h"
 #include "network/Client.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -51 +51 @@
     void GSClient::enter()
     {
-        Settings::_getInstance().setIsClient(true);
+        Core::setIsClient(true);
 
         GSLevel::enter();
@@ -81 +81 @@
         GSLevel::leave();
 
-        Settings::_getInstance().setIsClient(false);
+        Core::setIsClient(false);
     }
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSDedicated.cc

@@ -35 +35 @@
 #include "core/CommandLine.h"
 #include "core/Loader.h"
+#include "core/Core.h"
 #include "network/Server.h"
 #include "objects/Tickable.h"
+#include "Settings.h"
 #include "GraphicsEngine.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -57 +58 @@
     void GSDedicated::enter()
     {
-        Settings::_getInstance().setHasServer(true);
+        Core::setHasServer(true);
 
         // create Ogre SceneManager for the level
@@ -97 +98 @@
         Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
 
-        Settings::_getInstance().setHasServer(false);
+        Core::setHasServer(false);
     }
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSGraphics.cc

@@ -47 +47 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
+#include "core/Core.h"
 #include "core/input/InputManager.h"
 #include "core/input/KeyBinder.h"
@@ -101 +102 @@
     void GSGraphics::enter()
     {
-        Settings::_getInstance().setShowsGraphics(true);
+        Core::setShowsGraphics(true);
 
         // initialise graphics engine. Doesn't load the render window yet!
@@ -196 +197 @@
         delete graphicsEngine_;
 
-        Settings::_getInstance().setShowsGraphics(false);
+        Core::setShowsGraphics(false);
     }
 

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

@@ -44 +44 @@
 #include "objects/Radar.h"
 //#include "tools/ParticleInterface.h"
+#include "GraphicsEngine.h"
 #include "Settings.h"
-#include "GraphicsEngine.h"
 
 namespace orxonox

code/branches/objecthierarchy/src/orxonox/gamestates/GSServer.cc

@@ -33 +33 @@
 #include "core/input/InputManager.h"
 #include "core/CommandLine.h"
+#include "core/Core.h"
 #include "network/Server.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -52 +52 @@
     void GSServer::enter()
     {
-        Settings::_getInstance().setHasServer(true);
+        Core::setHasServer(true);
 
         GSLevel::enter();
@@ -86 +86 @@
         GSLevel::leave();
 
-        Settings::_getInstance().setHasServer(false);
+        Core::setHasServer(false);
     }
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSStandalone.cc

@@ -32 +32 @@
 #include "core/input/InputManager.h"
 #include "core/ConsoleCommand.h"
-#include "Settings.h"
+#include "core/Core.h"
 
 namespace orxonox
@@ -59 +59 @@
         InputManager::getInstance().requestEnterState("game");
 
-        Settings::_getInstance().setIsStandalone(true);
+        Core::setIsStandalone(true);
     }
 
@@ -72 +72 @@
         GSLevel::leave();
 
-        Settings::_getInstance().setIsStandalone(false);
+        Core::setIsStandalone(false);
     }