Changeset 1200 for code/branches/network3/src/network/GameStateClient.cc

Timestamp:

Apr 28, 2008, 11:39:23 PM (16 years ago)

Author:

scheusso

Message:

we have compression enabled and working now, hurray

File:

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

code/branches/network3/src/network/GameStateClient.cc

@@ -133 +133 @@
           orxonox::Identifier* id = ID((unsigned int)sync.classID);
           if(!id){
-            COUT(4) << "We could not identify a new object" << std::endl;
+            COUT(4) << "We could not identify a new object; classid: " << sync.classID << std::endl;
             continue;
           }
@@ -192 +192 @@
     r->id = diff->id;
     r->size = dest_length;
-    r->base_id = diff->base_id;
+    r->base_id = old->id;
     r->diffed = false;
     r->data = dp;
@@ -236 +236 @@
     gamestate->size = normsize;
     gamestate->data = dest;
+    gamestate->base_id = a->base_id;
     gamestate->diffed = a->diffed;
 
@@ -252 +253 @@
 
   GameState *GameStateClient::decode(GameStateCompressed *x) {
-    //GameState *t = decompress(x);
-    GameState *t = new GameState;
+    GameState *t = decompress(x);
+    /*GameState *t = new GameState;
     t->base_id = x->base_id;
     t->id = x->id;
     t->diffed = x->diffed;
     t->data = x->data;
-    t->size = x->normsize;
+    t->size = x->normsize;*/
     return t;
   }