Changeset 5820 for code/branches/core5/src/orxonox

Timestamp:

Sep 28, 2009, 2:55:47 AM (15 years ago)

Author:

landauf

Message:

Changes in ClientConnectionListener:

• Added static functions for connect/disconnect which notify all instances
• getConnectedClients() also returned client "0" which is the ID of the server. This is important for the PlayerManager, but other classes (like for example TrafficControl) don't use getConnectedClients(), so I assumed I can safely remove this line. The 0-client gets now connected and disconnected in GSLevel (which also creates and destroys the PlayerManager). If the 0-client is also needed by other classes, I suggest moving it into the network.

The instance of HumanPlayer is now deleted if GSLevel gets deactivated. This also destroys the default HUD.

Location:

code/branches/core5/src/orxonox

Files:

• LevelManager.cc (modified) (1 diff)
• PlayerManager.cc (modified) (1 diff)
• PlayerManager.h (modified) (1 diff)

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

@@ -39 +39 @@
 #include "PlayerManager.h"
 #include "Level.h"
-#include "infos/HumanPlayer.h"
 
 namespace orxonox

code/branches/core5/src/orxonox/PlayerManager.cc

@@ -74 +74 @@
         if (GameMode::isMaster())
         {
-            COUT(3) << "client disconnected" << std::endl;
+            if (clientID != 0)
+                COUT(3) << "client disconnected" << std::endl;
 
             // remove from clients-map

code/branches/core5/src/orxonox/PlayerManager.h

@@ -50 +50 @@
                 { return this->clients_; }
 
-        private:
             void clientConnected(unsigned int clientID);
             void clientDisconnected(unsigned int clientID);
 
+        private:
             std::map<unsigned int, PlayerInfo*> clients_;