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

Timestamp:

Oct 18, 2008, 10:58:46 PM (16 years ago)

Author:

landauf

Message:

did some first (and very unfinished) steps to deal with different players on server and client

Location:

code/branches/objecthierarchy/src/orxonox/gamestates

Files:

• GSClient.cc (modified) (2 diffs)
• GSDedicated.cc (modified) (2 diffs)
• GSGraphics.cc (modified) (3 diffs)
• GSServer.cc (modified) (2 diffs)
• GSStandalone.cc (modified) (3 diffs)

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

@@ -51 +51 @@
     void GSClient::enter()
     {
-        Settings::_getInstance().bIsClient_ = true;
+        Settings::_getInstance().setIsClient(true);
 
         GSLevel::enter();
@@ -81 +81 @@
         GSLevel::leave();
 
-        Settings::_getInstance().bIsClient_ = false;
+        Settings::_getInstance().setIsClient(false);
     }
 

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

@@ -57 +57 @@
     void GSDedicated::enter()
     {
-        Settings::_getInstance().bHasServer_ = true;
+        Settings::_getInstance().setHasServer(true);
 
         // create Ogre SceneManager for the level
@@ -97 +97 @@
         Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
 
-        Settings::_getInstance().bHasServer_ = false;
+        Settings::_getInstance().setHasServer(false);
     }
 

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

@@ -101 +101 @@
     void GSGraphics::enter()
     {
-        Settings::_getInstance().bShowsGraphics_ = true;
+        Settings::_getInstance().setShowsGraphics(true);
 
         // initialise graphics engine. Doesn't load the render window yet!
@@ -196 +196 @@
         delete graphicsEngine_;
 
-        Settings::_getInstance().bShowsGraphics_ = false;
+        Settings::_getInstance().setShowsGraphics(false);
     }
 
@@ -221 +221 @@
         this->console_->tick(dt);
         this->tickChild(time);
-        
+
         unsigned long long timeAfterTick = time.getRealMicroseconds();
 

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

@@ -52 +52 @@
     void GSServer::enter()
     {
-        Settings::_getInstance().bHasServer_ = true;
+        Settings::_getInstance().setHasServer(true);
 
         GSLevel::enter();
@@ -85 +85 @@
 
         GSLevel::leave();
-        
-        Settings::_getInstance().bHasServer_ = false;
+
+        Settings::_getInstance().setHasServer(false);
     }
 

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

@@ -32 +32 @@
 #include "core/input/InputManager.h"
 #include "core/ConsoleCommand.h"
+#include "Settings.h"
 
 namespace orxonox
@@ -57 +58 @@
         // level is loaded: we can start capturing the input
         InputManager::getInstance().requestEnterState("game");
+
+        Settings::_getInstance().setIsStandalone(true);
     }
 
@@ -68 +71 @@
 
         GSLevel::leave();
+
+        Settings::_getInstance().setIsStandalone(false);
     }