Changeset 1261 for code/branches/network3/src/network/ConnectionManager.cc

Timestamp:

May 12, 2008, 11:44:01 PM (16 years ago)

Author:

scheusso

Message:

fixed a 'bug' in WE-Model-Spaceship

File:

• code/branches/network3/src/network/ConnectionManager.cc (modified) (2 diffs)

code/branches/network3/src/network/ConnectionManager.cc

@@ -191 +191 @@
           //std::cout << "received data" << std::endl;
           COUT(5) << "Con.Man: receive event has occured" << std::endl;
-          processData(event);
+          // only add, if client has connected yet and not been disconnected
+          if(head_->findClient(&event->peer->address))
+            processData(event);
           break;
         case ENET_EVENT_TYPE_DISCONNECT:
@@ -354 +356 @@
   }
   
+  bool ConnectionManager::removeShip(ClientInformation *client){
+    int id=client->getShipID();
+    orxonox::Iterator<orxonox::SpaceShip> it;
+    for(it = orxonox::ObjectList<orxonox::SpaceShip>::start(); it; ++it){
+      if(it->objectID!=id)
+        continue;
+      delete *it;
+    }
+    return true;
+  }
+  
   bool ConnectionManager::sendWelcome(int clientID, int shipID, bool allowed){
     addPacket(packet_gen.generateWelcome(clientID, shipID, allowed),clientID);
     sendPackets();
     return true;
+  }
+  
+  void ConnectionManager::disconnectClient(ClientInformation *client){
+    enet_peer_disconnect(client->getPeer(), 0);
+    removeShip(client);
   }