Changeset 1016

Timestamp:

Apr 10, 2008, 3:31:07 PM (16 years ago)

Author:

scheusso

Message:

blub

Location:

code/branches/network/src/network

Files:

• GameStateClient.cc (modified) (1 diff)
• GameStateManager.cc (modified) (2 diffs)

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

@@ -214 +214 @@
 
   GameState *GameStateClient::decode(GameState *a, GameStateCompressed *x) {
-    GameState *t = decompress(x);
+    GameState *t = decode(x);
     gameStateList.push(t);
-    return undiff(a, t);
+    //return undiff(a, t);
+    return t;
   }
 
   GameState *GameStateClient::decode(GameStateCompressed *x) {
-    GameState *t = decompress(x);
+    //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;
     gameStateList.push(t);
     return t;

code/branches/network/src/network/GameStateManager.cc

@@ -197 +197 @@
     GameState *r = b;
     r->diffed = false;
-    return compress_(r);
+    //return compress_(r);
+    GameStateCompressed *g = new GameStateCompressed;
+    g->base_id = b->base_id;
+    g->id = b->id;
+    g->diffed = b->diffed;
+    g->data = b->data;
+    g->normsize = b->size;
+    g->compsize = b->size;
+    return g;
   }
 
@@ -203 +211 @@
     COUT(5) << "G.St.Man: this will be a not diffed gamestate" << std::endl;
     a->diffed=false;
-    return compress_(a);
+    GameStateCompressed *g = new GameStateCompressed;
+    g->base_id = a->base_id;
+    g->id = a->id;
+    g->diffed = a->diffed;
+    g->data = a->data;
+    g->normsize = a->size;
+    g->compsize = a->size;
+    return g;
   }