Changeset 1715 for code/branches/network/src/network/packet/Gamestate.cc

Timestamp:

Sep 6, 2008, 3:16:11 PM (16 years ago)

Author:

scheusso

Message:

further bugfixes concerning packet handling

File:

• code/branches/network/src/network/packet/Gamestate.cc (modified) (10 diffs)

code/branches/network/src/network/packet/Gamestate.cc

@@ -49 +49 @@
 }
 
-Gamestate::Gamestate(unsigned char *data, bool compressed, int clientID):
+Gamestate::Gamestate(unsigned char *data, int clientID):
     Packet(data, clientID)
 {
-  compressed_ = compressed;
 }
 
@@ -106 +105 @@
   //start write gamestate header
   HEADER->packetType = ENUM::Gamestate;
-  assert( *(ENUM::Type *)&data_[ 0 ] == ENUM::Gamestate); 
+  assert( *(ENUM::Type *)(data_) == ENUM::Gamestate); 
   HEADER->normsize = currentsize;
   HEADER->id = id;
   HEADER->diffed = false;
   HEADER->complete = true;
-  compressed_=false;
+  HEADER->compressed = false;
   //stop write gamestate header
   
@@ -121 +120 @@
 bool Gamestate::spreadData(int mode)
 {
-  assert(data_ && !compressed_ && !HEADER->diffed);
+  assert(data_ && !HEADER->compressed && !HEADER->diffed);
   unsigned int size, objectID, classID;
   unsigned char *mem=data_+sizeof(GamestateHeader);
@@ -167 +166 @@
 {
   assert(data_);
-  if(compressed_)
+  if(HEADER->compressed)
     return HEADER->compsize+sizeof(GamestateHeader);
   else
@@ -203 +202 @@
   //copy and modify header
   HEADER->compsize = buffer;
+  HEADER->compressed = true;
   *GAMESTATE_HEADER(ndata) = *HEADER;
   //delete old data
@@ -208 +208 @@
   //save new data
   data_ = ndata;
-  compressed_ = true;
   return true;
 }
 bool Gamestate::decompressData()
 {
-  assert(compressed_);
+  assert(HEADER->compressed);
   //COUT(4) << "GameStateClient: uncompressing gamestate. id: " << a->id << ", baseid: " << a->base_id << ", normsize: " << a->normsize << ", compsize: " << a->compsize << std::endl;
   int normsize = HEADER->normsize;
@@ -236 +235 @@
   }
   
-  compressed_ = false;
+  HEADER->compressed = false;
   //copy over the header
   *GAMESTATE_HEADER(ndata) = *HEADER;
@@ -273 +272 @@
   }
 
-  Gamestate *g = new Gamestate(ndata, false, 0);
+  *GAMESTATE_HEADER(ndata) = *HEADER;
+  GAMESTATE_HEADER(ndata)->diffed = true;
+  Gamestate *g = new Gamestate(ndata, 0);
   return g;
 }
@@ -280 +281 @@
 {
   assert(this && base);
-  assert(!this->compressed_ && !base->compressed_);
+  assert(!HEADER->compressed && !GAMESTATE_HEADER(base->data_)->compressed);
   //unsigned char *basep = base->getGs()/*, *gs = getGs()*/;
   unsigned char *basep = GAMESTATE_START(base->data_);
@@ -304 +305 @@
     }
   }
-  
-  Gamestate *g = new Gamestate(ndata, false, 0);
+  *GAMESTATE_HEADER(ndata) = *HEADER;
+  GAMESTATE_HEADER(ndata)->diffed = false;
+  Gamestate *g = new Gamestate(ndata, 0);
   return g;
 }