Changeset 1739 for code/branches/network/src/network/GamestateClient.cc

Timestamp:

Sep 8, 2008, 1:36:32 AM (16 years ago)

Author:

scheusso

Message:

further fixes (diff/undiff not working yet)

File:

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

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

@@ -73 +73 @@
       return 0;
     int id = GAMESTATEID_INITIAL;
-    bool b = saveShipCache();
-    if(processGamestate(tempGamestate_)){
-      if(b)
-        loadShipCache();
-      id = tempGamestate_->getID();
-    }
+    //bool b = saveShipCache();
+    packet::Gamestate *processed = processGamestate(tempGamestate_);
+    assert(processed);
+    //successfully loaded data from gamestate. now save gamestate for diff and delete the old gs
+    tempGamestate_=0;
+    gamestateMap_[processed->getID()]=processed;
+    last_diff_ = processed->getBaseID();
+    last_gamestate_ = processed->getID();
+    //if(b)
+      //loadShipCache();
+    id = processed->getID();
     cleanup();
     return id;
@@ -151 +156 @@
   }
 
-  bool GamestateClient::processGamestate(packet::Gamestate *gs){
-    assert(gs->decompressData());
-    if(gs->isDiffed())
-      assert(gs->undiff(gamestateMap_[gs->getBaseID()]));
-    return gs->spreadData();
+  packet::Gamestate *GamestateClient::processGamestate(packet::Gamestate *gs){
+    if(gs->isCompressed())
+      assert(gs->decompressData());
+    if(gs->isDiffed()){
+      packet::Gamestate *base = gamestateMap_[gs->getBaseID()];
+      assert(base);
+      packet::Gamestate *undiffed = gs->undiff(base);
+      delete gs;
+      gs=undiffed;
+      COUT(3) << "successfully undiffed gamestate id: " << undiffed->getID() << std::endl;
+    }
+    if(gs->spreadData())
+      return gs;
+    else
+      return NULL;
   }