Changeset 1949 for code/branches/objecthierarchy/src/orxonox/Settings.h

Timestamp:

Oct 19, 2008, 2:24:33 PM (16 years ago)

Author:

rgrieder

Message:

Moved all showsGraphics, hasServer, etc. functions from Settings class to Core class.
This was necessary to avoid circular dependencies.

File:

• code/branches/objecthierarchy/src/orxonox/Settings.h (modified) (3 diffs)

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

@@ -50 +50 @@
         friend class ClassIdentifier<Settings>;
         friend class GSRoot;
-        friend class GSGraphics;
-        friend class GSServer;
-        friend class GSClient;
-        friend class GSDedicated;
-        friend class GSStandalone;
 
     public:
@@ -62 +57 @@
         { assert(singletonRef_s); singletonRef_s->_tsetDataPath(path); }
 
-        // an alternative to a global game mode variable
-        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_; }
-        static bool isStandalone()  { assert(singletonRef_s); return singletonRef_s->bIsStandalone_; }
-        static bool isMaster()      { assert(singletonRef_s); return singletonRef_s->bIsMaster_; }
-
     private:
-        // GSRoot has access to these
-        static void setShowsGraphics(bool val) { assert(singletonRef_s); singletonRef_s->bShowsGraphics_ = val; singletonRef_s->updateIsMaster(); }
-        static void setHasServer    (bool val) { assert(singletonRef_s); singletonRef_s->bHasServer_     = val; singletonRef_s->updateIsMaster(); }
-        static void setIsClient     (bool val) { assert(singletonRef_s); singletonRef_s->bIsClient_      = val; singletonRef_s->updateIsMaster(); }
-        static void setIsStandalone (bool val) { assert(singletonRef_s); singletonRef_s->bIsStandalone_  = val; singletonRef_s->updateIsMaster(); }
-        static void updateIsMaster  ()         { assert(singletonRef_s); singletonRef_s->bIsMaster_ = (singletonRef_s->bHasServer_ || singletonRef_s->bIsStandalone_); }
-
         Settings();
         Settings(const Settings& instance);
@@ -87 +68 @@
         void setConfigValues();
 
-        bool bShowsGraphics_;                                  //!< global variable that tells whether to show graphics
-        bool bHasServer_;                                      //!< global variable that tells whether this is a server
-        bool bIsClient_;
-        bool bIsStandalone_;
-        bool bIsMaster_;
-
         std::string dataPath_;                                 //!< Path to the game data