Changeset 2662 for code/trunk/src/network/GamestateClient.cc

Timestamp:

Feb 14, 2009, 10:17:35 PM (16 years ago)

Author:

rgrieder

Message:

Merged presentation branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/network/GamestateClient.cc (modified) (4 diffs)

code/trunk/src/network/GamestateClient.cc

@@ -35 +35 @@
 #include "core/BaseObject.h"
 #include "core/Iterator.h"
-#include "Synchronisable.h"
+#include "synchronisable/Synchronisable.h"
+#include "synchronisable/NetworkCallbackManager.h"
 #include "packet/Acknowledgement.h"
 
@@ -74 +75 @@
     if(tempGamestate_==NULL)
       return false;
+    bool isDiffed = tempGamestate_->isDiffed();
     int id = GAMESTATEID_INITIAL;
     packet::Gamestate *processed = processGamestate(tempGamestate_);
-//    assert(processed);
-    if (!processed)
-        return false;
+    assert(processed);
+    
+    //now call the queued callbacks
+    NetworkCallbackManager::callCallbacks();
+    
+    if (!processed){
+      sendAck(0);
+      return false;
+    }
     //successfully loaded data from gamestate. now save gamestate for diff and delete the old gs
     tempGamestate_=NULL;
     gamestateMap_[processed->getID()]=processed;
-    last_diff_ = processed->getID();
+    if(isDiffed)
+      last_diff_ = processed->getBaseID();
     id = processed->getID();
     sendAck(id);
@@ -153 +162 @@
       packet::Gamestate *base = gamestateMap_[gs->getBaseID()];
       if(!base){
+        COUT(3) << "could not find base gamestate id: " << gs->getBaseID() << endl;
         delete gs;
         return 0;
@@ -165 +175 @@
       return gs;
     else
+    {
+      COUT(3) << "could not spread gamestate" << endl;
       return NULL;
+    }
   }