Changeset 1574 for code/branches/core3/src/network/Server.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/Server.cc (modified) (13 diffs)

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

@@ -57 +57 @@
   #define MAX_FAILURES 20;
   #define NETWORK_FREQUENCY 30
-  
+
   Server *Server::instance_=0;
-  
+
   Server *Server::createSingleton(){
     if(!instance_)
@@ -80 +80 @@
     return instance_;
   }
-  
+
   Server *Server::getSingleton(){
     return instance_;
   }
-  
-  
+
+
   /**
   * Constructor for default values (bindaddress is set to ENET_HOST_ANY
@@ -97 +97 @@
     gamestates = new GameStateManager(clients);
   }
-  
+
   Server::Server(int port){
     timeSinceLastUpdate_=0;
@@ -217 +217 @@
         if(clients->findClient(&event->peer->address)){
           clientID = clients->findClient(&event->peer->address)->getID();
-          if( !elaborate(event->packet, clientID) ) 
+          if( !elaborate(event->packet, clientID) )
             COUT(3) << "Server: could not elaborate" << std::endl;
         }
@@ -276 +276 @@
         continue;
       if ( !(connection->addPacket(packet, cid)) ){
-        COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->getFailures() << std::endl; 
+        COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->getFailures() << std::endl;
         temp->addFailure();
         /*if(temp->getFailures() > 0 )
@@ -302 +302 @@
     delete data;
   }
-  
+
   bool Server::processConnectRequest( connectRequest *con, int clientID ){
     //(COUT(3) << "processing connectRequest " << std::endl;
@@ -310 +310 @@
     return true;
   }
-  
+
   void Server::processGamestate( GameStateCompressed *data, int clientID){
     COUT(4) << "processing partial gamestate from client " << clientID << std::endl;
@@ -319 +319 @@
         clients->findClient(clientID)->resetFailures();*/
   }
-  
+
   void Server::processChat( chat *data, int clientId){
     char *message = new char [strlen(data->message)+10+1];
@@ -329 +329 @@
     delete data;
   }
-  
+
   bool Server::addClient(ENetEvent *event){
     ClientInformation *temp = clients->insertBack(new ClientInformation);
@@ -346 +346 @@
     return createClient(temp->getID());
   }
-  
+
   bool Server::createClient(int clientID){
     ClientInformation *temp = clients->findClient(clientID);
@@ -366 +366 @@
     return true;
   }
-  
+
   bool Server::createShip(ClientInformation *client){
     if(!client)
@@ -390 +390 @@
     no->classID = id->getNetworkID();
     no->create();
-    
+
     client->setShipID(no->objectID);
     return true;
   }
-  
+
   bool Server::disconnectClient(ENetEvent *event){
     COUT(4) << "removing client from list" << std::endl;
     //return removeClient(head_->findClient(&(peer->address))->getID());
-    
+
     //boost::recursive_mutex::scoped_lock lock(head_->mutex_);
-    orxonox::Iterator<orxonox::SpaceShip> it = orxonox::ObjectList<orxonox::SpaceShip>::start();
+    orxonox::Iterator<orxonox::SpaceShip> it = orxonox::ObjectList<orxonox::SpaceShip>::begin();
     ClientInformation *client = clients->findClient(&event->peer->address);
     if(!client)
@@ -426 +426 @@
     gamestates->removeClient(client);
   }
-  
+
 }