Changeset 2168 for code/branches/objecthierarchy/src/orxonox/objects/infos

Timestamp:

Nov 9, 2008, 7:11:53 PM (16 years ago)

Author:

landauf

Message:

Split up LevelManager into LevelManager and PlayerManager where LevelManager handles all levels and is only active on the server, while PlayerManager handles client connections and passes new players to the LevelManager (if running on a server). If running on a client, PlayerManager just maps PlayerInfos with clientIDs.

Also added a small hack in Level.cc to show the ChatOverlay on clients.

File:

• code/branches/objecthierarchy/src/orxonox/objects/infos/Level.cc (modified) (4 diffs)

code/branches/objecthierarchy/src/orxonox/objects/infos/Level.cc

@@ -40 +40 @@
 #include "PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
+#include "overlays/OverlayGroup.h"
 
 #include "util/Math.h"
@@ -62 +63 @@
         if (this->isInitialized())
         {
-            LevelManager::getInstance().releaseActivity(this);
+            if (LevelManager::getInstancePtr())
+                LevelManager::getInstance().releaseActivity(this);
 
             if (this->xmlfile_)
@@ -93 +95 @@
         mask.exclude(Class(BaseObject));
         mask.include(Class(Template));
+        mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
 
         this->xmlfile_ = new XMLFile(Settings::getDataPath() + this->xmlfilename_, mask);
@@ -112 +115 @@
                 (*it)->setGametype(rootgametype);
 
-            LevelManager::getInstance().requestActivity(this);
+            if (LevelManager::getInstancePtr())
+                LevelManager::getInstance().requestActivity(this);
         }
     }