Changeset 1574 for code/branches/core3/src/network/ConnectionManager.cc

Timestamp:

Jun 9, 2008, 4:35:38 AM (16 years ago)

Author:

landauf

Message:

big change in ObjectList: separated the class into a non-template base and a template wrapper for the base. this also changes the Iterator, there is now a non-template IteratorBase. this brings much more flexibility, like iterating through all objects of a given identifier without knowing the type. however this needs a dynamic_cast, which isn't quite optimal, but I think there are much worser things than that out there.

there isn't much you have to know about this, except there is no more ObjectList<myClass>::start() function but a ObjectList<myClass>::begin() to be more STLish. another thing: ObjectList<myClass>::end() points now to the element _after_ the last element, so it's possible to iterate in a for-loop until (it != ObjectList<myClass>::end()). the reason is the same as above. however, (it) as a boolean still works perfectly fine.

File:

• code/branches/core3/src/network/ConnectionManager.cc (modified) (9 diffs)

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

@@ -64 +64 @@
 {
   //boost::thread_group network_threads;
-  
+
   ConnectionManager::ConnectionManager():receiverThread_(0){}
   boost::recursive_mutex ConnectionManager::enet_mutex_;
-  
+
   ConnectionManager::ConnectionManager(ClientInformation *head) : receiverThread_(0) {
     quit=false;
@@ -74 +74 @@
     head_ = head;
   }
-  
+
   ConnectionManager::ConnectionManager(ClientInformation *head, int port){
     quit=false;
@@ -115 +115 @@
     return packet;
   }*/
-  
+
   ENetEvent *ConnectionManager::getEvent(){
     if(!buffer.isEmpty())
@@ -251 +251 @@
     }
   }
-  
+
   //### added some bugfixes here, but we cannot test them because
   //### the server crashes everytime because of some gamestates
@@ -333 +333 @@
   }
 
-  
-  
+
+
   bool ConnectionManager::removeShip(ClientInformation *client){
     int id=client->getShipID();
     orxonox::Iterator<orxonox::SpaceShip> it;
-    for(it = orxonox::ObjectList<orxonox::SpaceShip>::start(); it; ++it){
+    for(it = orxonox::ObjectList<orxonox::SpaceShip>::begin(); it; ++it){
       if(it->objectID!=id)
         continue;
@@ -345 +345 @@
     return true;
   }
-  
+
   bool ConnectionManager::sendWelcome(int clientID, int shipID, bool allowed){
     if(addPacket(packet_gen.generateWelcome(clientID, shipID, allowed),clientID)){
@@ -353 +353 @@
       return false;
   }
-  
+
   void ConnectionManager::disconnectClient(ClientInformation *client){
     {
@@ -362 +362 @@
     removeShip(client);
   }
-  
+
   bool ConnectionManager::addFakeConnectRequest(ENetEvent *ev){
     ENetEvent event;
@@ -369 +369 @@
     return buffer.push(&event);
   }
-  
-  
+
+
 
 }