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

Timestamp:

Sep 7, 2008, 3:30:52 PM (16 years ago)

Author:

scheusso

Message:

more progress (still not ok)

File:

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

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

@@ -128 +128 @@
   while(mem < data_+sizeof(GamestateHeader)+HEADER->normsize){
       // extract synchronisable header
-    size = *(int *)mem;
-    objectID = *(int*)(mem+sizeof(int));
-    classID = *(int*)(mem+2*sizeof(int));
-
-    if(!it || it->objectID!=objectID){
+    size = *(unsigned int *)mem;
+    objectID = *(unsigned int*)(mem+sizeof(unsigned int));
+    classID = *(unsigned int*)(mem+2*sizeof(unsigned int));
+
+    if(!it || it->objectID!=objectID || it->classID!=classID){
         // bad luck ;)
         // delete the synchronisable (obviously seems to be deleted on the server)
@@ -141 +141 @@
         //fabricate the new synchronisable
         if(!Synchronisable::fabricate(mem, mode))
-          return false;
+          /*return false*/;
         it=orxonox::ObjectList<Synchronisable>::end();
       }
@@ -208 +208 @@
   //save new data
   data_ = ndata;
+  assert(HEADER->compressed);
+  COUT(3) << "gamestate compress normsize: " << HEADER->normsize << " compsize: " << HEADER->compsize << std::endl;
   return true;
 }