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

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/LevelManager.h (modified) (3 diffs)

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

@@ -36 +36 @@
 #include <cassert>
 
-#include "network/ClientConnectionListener.h"
-
 namespace orxonox
 {
-    class _OrxonoxExport LevelManager : public ClientConnectionListener
+    class _OrxonoxExport LevelManager
     {
         public:
@@ -50 +48 @@
             Level* getActiveLevel();
 
-            PlayerInfo* getClient(unsigned int clientID) const;
-            inline const std::map<unsigned int, PlayerInfo*>& getClients() const
-                { return this->clients_; }
-
+            static LevelManager* getInstancePtr() { return singletonRef_s; }
             static LevelManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
@@ -59 +54 @@
             LevelManager(const LevelManager&);
 
-            void clientConnected(unsigned int clientID);
-            void clientDisconnected(unsigned int clientID);
-
             void activateNextLevel();
 
             std::list<Level*> levels_s;
-            std::map<unsigned int, PlayerInfo*> clients_;
-
             static LevelManager* singletonRef_s;
     };