Changeset 2419

Timestamp:

Dec 12, 2008, 11:47:11 AM (16 years ago)

Author:

scheusso

Message:

some cleaning up in TrafficControl
small bugfix in Gamestate
priorities should work quite well now

Location:

code/branches/presentation/src/network

Files:

• TrafficControl.cc (modified) (1 diff)
• packet/Gamestate.cc (modified) (3 diffs)
• synchronisable/Synchronisable.cc (modified) (1 diff)
• synchronisable/Synchronisable.h (modified) (1 diff)

code/branches/presentation/src/network/TrafficControl.cc

@@ -263 +263 @@
       //end of sorting
       //now the cutting, work the same obj out in processobjectlist and copiedlist, compression rate muss noch festgelegt werden. 
+//       printList(list, clientID);
       cut(list, targetSize);
       

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

@@ -361 +361 @@
   
   //copy in the zeros
-  for(it=dataMap_.begin(); it!=dataMap_.end(); it++){
+  for(it=dataMap_.begin(); it!=dataMap_.end();){
     oldobjectheader = (synchronisableHeader*)origdata;
     newobjectheader = (synchronisableHeader*)newdata;
@@ -371 +371 @@
       memcpy(newdata, origdata, objectsize);
       assert(newobjectheader->dataAvailable==true);
+      ++it;
     }else{
       *newobjectheader = *oldobjectheader;
@@ -382 +383 @@
   }
   ((GamestateHeader*)gdata)->datasize = destsize;
+  assert(destsize==HEADER->datasize);
   assert(destsize!=0);
   return gs;

code/branches/presentation/src/network/synchronisable/Synchronisable.cc

@@ -354 +354 @@
     //assert( (mode ^ objectMode_) != 0);
     if(syncList.empty()){
+      assert(0);
       COUT(4) << "Synchronisable::updateData syncList is empty" << std::endl;
       return false;

code/branches/presentation/src/network/synchronisable/Synchronisable.h

@@ -64 +64 @@
   namespace priority{
     enum prio{
-      very_high   = -30,
+      very_high   = -100,
       high        = -15,
       normal      = 0,
       low         = 15,
-      very_low    = 30
+      very_low    = 100
     };
   }