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

Timestamp:

Oct 27, 2008, 10:56:51 PM (16 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.cc (modified) (1 diff)

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

@@ -38 +38 @@
 namespace orxonox
 {
+    LevelManager* LevelManager::singletonRef_s = 0;
+
     LevelManager::LevelManager()
     {
         RegisterRootObject(LevelManager);
 
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
+
         this->getConnectedClients();
     }
 
-    LevelManager& LevelManager::getInstance()
+    LevelManager::~LevelManager()
     {
-        static LevelManager instance;
-        return instance;
+        assert(singletonRef_s != 0);
+        singletonRef_s = 0;
     }