Changeset 1747 for code/trunk/src/network/Server.cc

Timestamp:

Sep 9, 2008, 4:25:52 AM (16 years ago)

Author:

landauf

Message:

merged core3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/network/Server.cc (modified) (14 diffs)

code/trunk/src/network/Server.cc

@@ -50 +50 @@
 #include "objects/SpaceShip.h"
 #include "core/ConsoleCommand.h"
+#include "core/Iterator.h"
 #include "packet/Chat.h"
 #include "packet/Packet.h"
@@ -58 +59 @@
   #define MAX_FAILURES 20;
   #define NETWORK_FREQUENCY 30
-  
+
   /**
   * Constructor for default values (bindaddress is set to ENET_HOST_ANY
@@ -68 +69 @@
     gamestates_ = new GamestateManager();
   }
-  
+
   Server::Server(int port){
     timeSinceLastUpdate_=0;
@@ -123 +124 @@
     return message->process();
   }
-  
+
   /**
   * This function sends out a message to all clients
@@ -175 +176 @@
     return;
   }
-  
+
   bool Server::queuePacket(ENetPacket *packet, int clientID){
     return connection->addPacket(packet, clientID);
@@ -230 +231 @@
     return p->process();
   }
-  
+
   /**
   * sends the gamestate
@@ -261 +262 @@
       assert(gs->compressData());
       if ( !gs->send() ){
-        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();
       }else
@@ -276 +277 @@
     return true;
   }
-  
+
 //   void Server::processChat( chat *data, int clientId){
 //     char *message = new char [strlen(data->message)+10+1];
@@ -286 +287 @@
 //     delete data;
 //   }
-  
+
   bool Server::addClient(ENetEvent *event){
     ClientInformation *temp = ClientInformation::insertBack(new ClientInformation);
@@ -303 +304 @@
     return createClient(temp->getID());
   }
-  
+
   bool Server::createClient(int clientID){
     ClientInformation *temp = ClientInformation::findClient(clientID);
@@ -325 +326 @@
     return true;
   }
-  
+
   bool Server::createShip(ClientInformation *client){
     if(!client)
@@ -351 +352 @@
     no->create();
     no->setBacksync(true);
-    
+
     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::ObjectList<orxonox::SpaceShip>::iterator it = orxonox::ObjectList<orxonox::SpaceShip>::begin();
     ClientInformation *client = ClientInformation::findClient(&event->peer->address);
     if(!client)
@@ -369 +370 @@
         continue;
       }
-      orxonox::Iterator<orxonox::SpaceShip> temp=it;
+      orxonox::ObjectList<orxonox::SpaceShip>::iterator temp=it;
       ++it;
       delete  *temp;
@@ -386 +387 @@
     gamestates_->removeClient(client);
   }
-  
+
 }