Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2419


Ignore:
Timestamp:
Dec 12, 2008, 11:47:11 AM (15 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:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation/src/network/TrafficControl.cc

    r2418 r2419  
    263263      //end of sorting
    264264      //now the cutting, work the same obj out in processobjectlist and copiedlist, compression rate muss noch festgelegt werden.
     265//       printList(list, clientID);
    265266      cut(list, targetSize);
    266267     
  • code/branches/presentation/src/network/packet/Gamestate.cc

    r2417 r2419  
    361361 
    362362  //copy in the zeros
    363   for(it=dataMap_.begin(); it!=dataMap_.end(); it++){
     363  for(it=dataMap_.begin(); it!=dataMap_.end();){
    364364    oldobjectheader = (synchronisableHeader*)origdata;
    365365    newobjectheader = (synchronisableHeader*)newdata;
     
    371371      memcpy(newdata, origdata, objectsize);
    372372      assert(newobjectheader->dataAvailable==true);
     373      ++it;
    373374    }else{
    374375      *newobjectheader = *oldobjectheader;
     
    382383  }
    383384  ((GamestateHeader*)gdata)->datasize = destsize;
     385  assert(destsize==HEADER->datasize);
    384386  assert(destsize!=0);
    385387  return gs;
  • code/branches/presentation/src/network/synchronisable/Synchronisable.cc

    r2417 r2419  
    354354    //assert( (mode ^ objectMode_) != 0);
    355355    if(syncList.empty()){
     356      assert(0);
    356357      COUT(4) << "Synchronisable::updateData syncList is empty" << std::endl;
    357358      return false;
  • code/branches/presentation/src/network/synchronisable/Synchronisable.h

    r2415 r2419  
    6464  namespace priority{
    6565    enum prio{
    66       very_high   = -30,
     66      very_high   = -100,
    6767      high        = -15,
    6868      normal      = 0,
    6969      low         = 15,
    70       very_low    = 30
     70      very_low    = 100
    7171    };
    7272  }
Note: See TracChangeset for help on using the changeset viewer.