Changeset 5820 for code/branches/core5/src/modules/gamestates/GSLevel.cc

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.

File:

• code/branches/core5/src/modules/gamestates/GSLevel.cc (modified) (3 diffs)

code/branches/core5/src/modules/gamestates/GSLevel.cc

@@ -129 +129 @@
             // level is loaded: we can start capturing the input
             InputManager::getInstance().enterState("game");
+            
+            // connect the HumanPlayer to the game
+            this->playerManager_->clientConnected(0);
         }
     }
@@ -177 +180 @@
 
         if (GameMode::showsGraphics())
+        {
+            // disconnect the HumanPlayer
+            this->playerManager_->clientDisconnected(0);
+            
             InputManager::getInstance().leaveState("game");
+        }
 
         if (GameMode::isMaster())
@@ -234 +242 @@
     void GSLevel::unloadLevel()
     {
-        for (ObjectList<HumanPlayer>::iterator it = ObjectList<HumanPlayer>::begin(); it; ++it)
-            it->setGametype(0);
-        
         Loader::unload(startFile_s);