Changeset 5966

Timestamp:

Oct 19, 2009, 8:25:30 PM (15 years ago)

Author:

scheusso

Message:

(kind of) fixed HumanPlayer bodys beeing around from clients that have not yet disconnected when unloading level

Location:

code/trunk/src/orxonox

Files:

• PlayerManager.cc (modified) (1 diff)
• PlayerManager.h (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (2 diffs)

code/trunk/src/orxonox/PlayerManager.cc

@@ -91 +91 @@
         }
     }
+    
+    void PlayerManager::disconnectAllClients()
+    {
+        for( std::map<unsigned int, PlayerInfo*>::iterator it = this->clients_.begin(); it != this->clients_.end(); )
+            this->clientDisconnected( (it++)->first );
+    }
 
 

code/trunk/src/orxonox/PlayerManager.h

@@ -52 +52 @@
             void clientConnected(unsigned int clientID);
             void clientDisconnected(unsigned int clientID);
+            void disconnectAllClients();
 
         private:

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -117 +117 @@
         if (GameMode::showsGraphics())
         {
-            // disconnect the HumanPlayer
-            PlayerManager::getInstance().clientDisconnected(0);
-            
             // unload all compositors (this is only necessary because we don't yet destroy all resources!)
             Ogre::CompositorManager::getSingleton().removeAll();
@@ -125 +122 @@
             InputManager::getInstance().leaveState("game");
         }
+        
+        // disconnect all HumanPlayers
+        PlayerManager::getInstance().disconnectAllClients();
 
         if (GameMode::isMaster())