Changeset 2660 for code/branches/presentation/src/network/GamestateClient.cc

Timestamp:

Feb 14, 2009, 6:01:05 PM (15 years ago)

Author:

scheusso

Message:

fixed a problem with gamestate caching and diffing

File:

• code/branches/presentation/src/network/GamestateClient.cc (modified) (5 diffs)

code/branches/presentation/src/network/GamestateClient.cc

@@ -75 +75 @@
     if(tempGamestate_==NULL)
       return false;
+    bool isDiffed = tempGamestate_->isDiffed();
     int id = GAMESTATEID_INITIAL;
     packet::Gamestate *processed = processGamestate(tempGamestate_);
@@ -83 +84 @@
     
     if (!processed){
-//      sendAck(0);
+      sendAck(0);
       return false;
     }
@@ -89 +90 @@
     tempGamestate_=NULL;
     gamestateMap_[processed->getID()]=processed;
-    last_diff_ = processed->getID();
+    if(isDiffed)
+      last_diff_ = processed->getBaseID();
     id = processed->getID();
-//     sendAck(id);
+    sendAck(id);
     return true;
   }
@@ -160 +162 @@
       packet::Gamestate *base = gamestateMap_[gs->getBaseID()];
       if(!base){
-COUT(0) << "could not find base gamestate id: " << gs->getBaseID() << endl;
+        COUT(3) << "could not find base gamestate id: " << gs->getBaseID() << endl;
         delete gs;
         return 0;
@@ -173 +175 @@
       return gs;
     else
-COUT(0) << "could not spread gamestate" << endl;
+    {
+      COUT(3) << "could not spread gamestate" << endl;
       return NULL;
+    }
   }