Changeset 2848 for code/branches/gui/src/network

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.

Location:

code/branches/gui/src/network

Files:

• ClientConnectionListener.cc (modified) (2 diffs)
• packet/Gamestate.cc (modified) (2 diffs)
• synchronisable/SynchronisableVariable.cc (modified) (2 diffs)

code/branches/gui/src/network/ClientConnectionListener.cc

@@ -29 +29 @@
 #include "ClientConnectionListener.h"
 #include "core/CoreIncludes.h"
-#include "core/Core.h"
+#include "core/GameMode.h"
 
 namespace orxonox{
@@ -39 +39 @@
 
   void ClientConnectionListener::getConnectedClients(){
-    if(Core::showsGraphics())
+    if(GameMode::showsGraphics())
       this->clientConnected(0); //server client id
     ClientInformation *client = ClientInformation::getBegin();

code/branches/gui/src/network/packet/Gamestate.cc

@@ -34 +34 @@
 #include "../synchronisable/Synchronisable.h"
 #include "../TrafficControl.h"
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/Iterator.h"
@@ -162 +162 @@
     if(!s)
     {
-      if (!Core::isMaster())
+      if (!GameMode::isMaster())
       {
         Synchronisable::fabricate(mem, mode);

code/branches/gui/src/network/synchronisable/SynchronisableVariable.cc

@@ -30 +30 @@
 #include <cstring>
 #include "util/Math.h"
-#include "core/Core.h"
+#include "core/GameMode.h"
 
 
@@ -41 +41 @@
   if ( state_ == 0x0 )
   {
-    state_ = Core::isMaster() ? 0x1 : 0x2;  // set the appropriate mode here
+    state_ = GameMode::isMaster() ? 0x1 : 0x2;  // set the appropriate mode here
   }
 }