Changeset 624 for code/branches/FICN/src/network/Server.cc

Timestamp:

Dec 18, 2007, 7:05:51 PM (16 years ago)

Author:

scheusso

Message:

changes in gamestatehandling

File:

• code/branches/FICN/src/network/Server.cc (modified) (2 diffs)

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

@@ -143 +143 @@
       }
       std::cout << "doing gamestate" << std::endl;
-      int id = temp->getID();
-      std::cout << "server, got ID: " << id << std::endl;
-      GameStateCompressed *gs = &(gamestates->popGameState(id));
-      std::cout << "adding gamestate" << std::endl;
-      connection->addPacket(packet_gen.gstate(gs), id);
-      std::cout << "added gamestate" << std::endl;
+      int gid = temp->getGamestateID();
+      int cid = temp->getID();
+      std::cout << "server, got acked ID: " << gid << std::endl;
+      GameStateCompressed *gs = &(gamestates->popGameState(cid));
+      //std::cout << "adding gamestate" << std::endl;
+      connection->addPacket(packet_gen.gstate(gs), cid);
+      //std::cout << "added gamestate" << std::endl;
       added=true;
       temp=temp->next();
@@ -159 +160 @@
   
   void Server::processAck( ack *data, int clientID){
-    clients->findClient(clientID)->setGamestateID(data->id);
+    clients->findClient(clientID)->setGamestateID(data->a);
   }