Changeset 1892 for code/branches

Timestamp:

Oct 6, 2008, 10:25:09 PM (16 years ago)

Author:

rgrieder

Message:

Added isClient() function in Settings.

Location:

code/branches/network/src/orxonox

Files:

• Settings.cc (modified) (1 diff)
• Settings.h (modified) (4 diffs)
• gamestates/GSClient.cc (modified) (3 diffs)

code/branches/network/src/orxonox/Settings.cc

@@ -51 +51 @@
         : bShowsGraphics_(false)
         , bHasServer_(false)
+        , bIsClient_(false)
     {
         RegisterRootObject(Settings);

code/branches/network/src/orxonox/Settings.h

@@ -54 +54 @@
         friend class GSServer;
         friend class GSDedicated;
+        friend class GSClient;
 
     public:
@@ -64 +65 @@
         static bool showsGraphics() { assert(singletonRef_s); return singletonRef_s->bShowsGraphics_; }
         static bool hasServer()     { assert(singletonRef_s); return singletonRef_s->bHasServer_; }
+        static bool isClient()      { assert(singletonRef_s); return singletonRef_s->bIsClient_; }
 
     private:
@@ -69 +71 @@
         static void setShowsGraphics(bool val) { assert(singletonRef_s); singletonRef_s->bShowsGraphics_ = val; }
         static void setHasServer    (bool val) { assert(singletonRef_s); singletonRef_s->bHasServer_     = val; }
+        static void setIsClient     (bool val) { assert(singletonRef_s); singletonRef_s->bIsClient_      = val; }
 
         Settings();
@@ -82 +85 @@
         bool bShowsGraphics_;                                  //!< global variable that tells whether to show graphics
         bool bHasServer_;                                      //!< global variable that tells whether this is a server
+        bool bIsClient_;
 
         std::string dataPath_;                                 //!< Path to the game data

code/branches/network/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;
     }