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

Timestamp:

Oct 12, 2008, 7:40:47 PM (16 years ago)

Author:

scheusso

Message:

merged network branch back to trunk

File:

• code/trunk/src/network/GamestateClient.cc (modified) (3 diffs)

code/trunk/src/network/GamestateClient.cc

@@ -156 +156 @@
     if(myShip_){
       //      unsigned char *data = new unsigned char[myShip_->getSize()];
-      int size=myShip_->getSize2(0, 0x1);
+      int size=myShip_->getSize(0, 0x1);
       if(size==0)
         return false;
@@ -182 +182 @@
   packet::Gamestate *GamestateClient::processGamestate(packet::Gamestate *gs){
     if(gs->isCompressed())
-      assert(gs->decompressData());
+    {
+      bool b = gs->decompressData();
+      assert(b);
+    }
     if(gs->isDiffed()){
       packet::Gamestate *base = gamestateMap_[gs->getBaseID()];
@@ -189 +192 @@
         return 0;
       }
-//      assert(base); //TODO: fix this
+//       assert(base); //TODO: fix this
       packet::Gamestate *undiffed = gs->undiff(base);
       delete gs;