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

Timestamp:

May 8, 2008, 4:15:45 PM (16 years ago)

Author:

scheusso

Message:

fixes over fixes

File:

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

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

@@ -64 +64 @@
       if(!reference){
         COUT(4) << "pushGameState: no reference found to diff" << std::endl;
+        delete[] compstate->data;
+        delete compstate;
         return false;
       }
@@ -89 +91 @@
   GameStateCompressed *GameStateClient::popPartialGameState(){
     GameState *gs = getPartialSnapshot();
-    return compress_(gs);
+    GameStateCompressed *cgs = compress_(gs);
+    delete[] gs->data;
+    delete gs;
+    return cgs;
   }
   
@@ -166 +171 @@
 
   GameState *GameStateClient::getPartialSnapshot(){
-    
-    GameState *reference;
-//     std::map<int, GameState*>::iterator it = --gameStateMap.end();
-//     reference=(--gameStateMap.end())->second;
-    
     //std::cout << "begin getSnapshot" << std::endl;
     //the size of the gamestate
@@ -306 +306 @@
     compressedGamestate->complete = a->complete;
     compressedGamestate->base_id = a->base_id;
-    delete[] a->data;
-    delete a;
     return compressedGamestate;
   }
@@ -344 +342 @@
     gamestate->complete = a->complete;
 
-    delete[] a->data; //delete compressed data
-    delete a; //we do not need the old (struct) gamestate anymore
 
     return gamestate;
@@ -353 +349 @@
     COUT(4) << "using diffed gamestate" << std::endl;
     GameState *t = decode(diff);
-    return undiff(old, t);
-//     return t;
+    GameState *r = undiff(old, t);
+    delete[] t->data;
+    delete t;
+    return r;
   }
 
   GameState *GameStateClient::decode(GameStateCompressed *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;*/
+    delete[] x->data;
+    delete x;
     return t;
   }