Changeset 1361 for code/branches/merge/src/network/GameStateManager.cc

Timestamp:

May 22, 2008, 2:09:33 PM (16 years ago)

Author:

scheusso

Message:

reverted some changes from previous version

File:

• code/branches/merge/src/network/GameStateManager.cc (modified) (3 diffs)

code/branches/merge/src/network/GameStateManager.cc

@@ -221 +221 @@
     orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::start();
     syncData sync;
-    /*ClientInformation *client = head_->findClient(clientID);
-    if(client)
-      if(client->getPartialGamestateID()>state->id){
-        COUT(3) << "we received an obsolete partial gamestate" << std::endl;
-        return false;
-      }
-    else;*/
-        //what should we do now ??
     // loop as long as we have some data ;)
     while(data < state->data+state->size){
@@ -276 +268 @@
       ++it;
     }
-    //client->setPartialGamestateID(state->id);
+    
     return true;
   }
@@ -436 +428 @@
       return;
     int curid = temp->getGamestateID();
-    if(curid > gamestateID)
-      // the network packets got messed up 
-      return;
     COUT(4) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;
     // decrease usage of gamestate and save it