Changeset 1907 for code/trunk/src/orxonox/Settings.h

Timestamp:

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

Author:

scheusso

Message:

merged network branch back to trunk

File:

• code/trunk/src/orxonox/Settings.h (modified) (4 diffs)

code/trunk/src/orxonox/Settings.h

@@ -52 +52 @@
         friend class GSGraphics;
         friend class GSServer;
+        friend class GSClient;
         friend class GSDedicated;
 
@@ -63 +64 @@
         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:
@@ -68 +70 @@
         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();
@@ -81 +84 @@
         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