Changeset 1916 for code/branches/objecthierarchy/src/network/ConnectionManager.cc

Timestamp:

Oct 14, 2008, 12:20:14 AM (16 years ago)

Author:

landauf

Message:

removed WorldEntity, SpaceShip and several other objects
removed SpaceShip-related hacks in network and other places

File:

• code/branches/objecthierarchy/src/network/ConnectionManager.cc (modified) (3 diffs)

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

@@ -49 +49 @@
 #include "core/BaseObject.h"
 #include "core/Iterator.h"
-#include "objects/SpaceShip.h"
 #include "util/Math.h"
 #include "util/Sleep.h"
@@ -331 +330 @@
 
 
-
-  bool ConnectionManager::removeShip(ClientInformation *client){
-    unsigned int id=client->getShipID();
-    orxonox::ObjectList<orxonox::SpaceShip>::iterator it;
-    for(it = orxonox::ObjectList<orxonox::SpaceShip>::begin(); it; ++it){
-      if(it->getObjectID()!=id)
-        continue;
-      delete *it;
-    }
-    return true;
-  }
-
-
   void ConnectionManager::disconnectClient(ClientInformation *client){
     {
@@ -350 +336 @@
       lock.unlock();
     }
-    removeShip(client);
   }