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

Timestamp:

Sep 8, 2008, 2:21:00 PM (16 years ago)

Author:

scheusso

Message:

compressing and diffing works now (also shipCache on client). server can't move while client connected. preparations for synchronise frequency of synchronisables

File:

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

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

@@ -73 +73 @@
       return 0;
     int id = GAMESTATEID_INITIAL;
-    //bool b = saveShipCache();
+    bool b = saveShipCache();
     packet::Gamestate *processed = processGamestate(tempGamestate_);
     assert(processed);
@@ -81 +81 @@
     last_diff_ = processed->getBaseID();
     last_gamestate_ = processed->getID();
-    //if(b)
-      //loadShipCache();
+    if(b)
+      loadShipCache();
     id = processed->getID();
     cleanup();
@@ -134 +134 @@
     if(myShip_){
       //      unsigned char *data = new unsigned char[myShip_->getSize()];
-      int size=myShip_->getSize(0x1);
+      int size=myShip_->getSize2(0, 0x1);
       if(size==0)
         return false;
       shipCache_ = new unsigned char [size];
       unsigned char *temp = shipCache_;
-      if(!myShip_->getData2(temp, 0x1))
+      if(!myShip_->getData(temp, 0, 0x1))
         COUT(3) << "could not save shipCache" << std::endl;
       return true;
@@ -157 +157 @@
 
   packet::Gamestate *GamestateClient::processGamestate(packet::Gamestate *gs){
-    if(gs->isCompressed()){
-      bool b = gs->decompressData();
-      assert(b);
-    }
+    if(gs->isCompressed())
+      assert(gs->decompressData());
     if(gs->isDiffed()){
       packet::Gamestate *base = gamestateMap_[gs->getBaseID()];