Changeset 2490

Timestamp:

Dec 16, 2008, 10:12:32 PM (15 years ago)

Author:

scheusso

Message:

some cleanup and fix concerning trafficcontrol (cutting gamestates)

Location:

code/branches/presentation/src/network/packet

Files:

• Gamestate.cc (modified) (3 diffs)
• Welcome.h (modified) (1 diff)

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

@@ -100 +100 @@
       COUT(3) << "G.St.Man: need additional memory" << std::endl;
       ObjectList<Synchronisable>::iterator temp = it;
-      int addsize=tempsize;
+      uint32_t addsize=tempsize;
       while(++temp)
         addsize+=temp->getSize(id, mode);
@@ -399 +399 @@
     newobjectheader = (synchronisableHeader*)newdata;
     if ( (*it).objSize == 0 )
+    {
+      ++it;
       continue;
+    }
 //     object = Synchronisable::getSynchronisable( (*it).objID );
 //     assert(object->objectID == oldobjectheader->objectID);
@@ -418 +421 @@
 //     origdata += objectsize;
   }
+#ifndef NDEBUG
+  uint32_t origsize = destsize;
+  while ( origsize < HEADER->datasize )
+  {
+    oldobjectheader = (synchronisableHeader*)origdata;
+    objectsize = oldobjectheader->size;
+    origdata += objectsize;
+    origsize += objectsize;
+  }
+  assert(origsize==HEADER->datasize);
+  assert(destsize!=0);
+#endif
   ((GamestateHeader*)gdata)->datasize = destsize;
-  assert(destsize==HEADER->datasize);
-  assert(destsize!=0);
   return gs;
 }

code/branches/presentation/src/network/packet/Welcome.h

@@ -42 +42 @@
 {
 public:
-  Welcome( unsigned int clientID, unsigned int shipID );
-  Welcome( uint8_t* data, unsigned int clientID );
+  Welcome( uint32_t clientID, uint32_t shipID );
+  Welcome( uint8_t* data, uint32_t clientID );
   virtual ~Welcome();