Changeset 1907 for code/trunk/src/orxonox/gamestates

Timestamp:

Oct 12, 2008, 7:40:47 PM (16 years ago)

Author:

scheusso

Message:

merged network branch back to trunk

Location:

code/trunk/src/orxonox/gamestates

Files:

• GSClient.cc (modified) (3 diffs)
• GSServer.cc (modified) (1 diff)

code/trunk/src/orxonox/gamestates/GSClient.cc

@@ -33 +33 @@
 #include "core/CommandLine.h"
 #include "network/Client.h"
+#include "Settings.h"
 
 namespace orxonox
@@ -50 +51 @@
     void GSClient::enter()
     {
+        Settings::_getInstance().bIsClient_ = true;
+
         GSLevel::enter();
 
@@ -77 +80 @@
 
         GSLevel::leave();
+
+        Settings::_getInstance().bIsClient_ = false;
     }
 

code/trunk/src/orxonox/gamestates/GSServer.cc

@@ -83 +83 @@
         this->server_->close();
         delete this->server_;
+        Settings::_getInstance().bHasServer_ = false;
 
         GSLevel::leave();
-
-        Settings::_getInstance().bHasServer_ = false;
     }