Changeset 7337 for code/branches

Timestamp:

Sep 3, 2010, 3:46:21 PM (14 years ago)

Author:

scheusso

Message:

fix in gamestate diff

File:

• code/branches/network3/src/libraries/network/packet/Gamestate.cc (modified) (5 diffs)

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

@@ -510 +510 @@
     assert(dest < newData + newDataSize);
     assert(sizes != this->sizes_.end());
+    bool diffedObject = false;
     while ( baseData < baseDataEnd )
     {
@@ -519 +520 @@
 //         goto DODIFF;
         diffObject(dest, origData, baseData, h, sizes);
+        diffedObject = true;
+        break;
       }
       {
@@ -529 +532 @@
         }
       }
+      baseData += htemp.getDataSize()+SynchronisableHeader::getSize();
 //       assert( baseData+htemp.getDataSize()+SynchronisableHeader::getSize() <=baseData+baseLength );
 //       temp += htemp.getDataSize()+SynchronisableHeader::getSize();
-        
+      
     }
     // If not found start looking at the beginning
-    assert( baseData == baseDataEnd );
+    assert( diffedObject || baseData == baseDataEnd );
     baseData = GAMESTATE_START(base->data_);
     {
@@ -545 +549 @@
       }
     }
-    while ( baseData < baseDataEnd )
+    while ( !diffedObject && baseData < baseDataEnd )
     {
       SynchronisableHeader htemp(baseData);
@@ -574 +578 @@
       assert(sizes != this->sizes_.end() || origData>=origDataEnd);
     }
-    
-  }
+  }
+  assert(sizes==this->sizes_.end());