Changeset 2023 for code/branches/objecthierarchy/src/orxonox/LevelManager.h

Timestamp:

Oct 27, 2008, 10:56:51 PM (17 years ago)

Author:

rgrieder

Message:

• Added support for dedicated server. Could not network test it yet, client still segfaults me.
• Also kicked GraphicsEngine::levelSceneManager_, there are only the statistic methods left.
• GSDedicated also derives from GSLevel, but GSLevel is not anymore a real GameState.
• CameraHandler and LevelManager get created in GSLevel now.

File:

• code/branches/objecthierarchy/src/orxonox/LevelManager.h (modified) (4 diffs)

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

@@ -34 +34 @@
 #include <list>
 #include <map>
+#include <cassert>
 
 #include "network/ClientConnectionListener.h"
@@ -42 +43 @@
     {
         public:
-            static LevelManager& getInstance();
+            LevelManager();
+            virtual ~LevelManager();
 
             void requestActivity(Level* level);
@@ -52 +54 @@
                 { return this->clients_; }
 
+            static LevelManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
+
         private:
-            LevelManager();
-            virtual ~LevelManager() {}
+            LevelManager(const LevelManager&);
 
             void clientConnected(unsigned int clientID);
@@ -63 +66 @@
             std::list<Level*> levels_s;
             std::map<unsigned int, PlayerInfo*> clients_;
+
+            static LevelManager* singletonRef_s;
     };
 }