Changeset 2490 for code/branches/presentation/src/network/packet
- Timestamp:
- Dec 16, 2008, 10:12:32 PM (16 years ago)
- Location:
- code/branches/presentation/src/network/packet
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation/src/network/packet/Gamestate.cc
r2485 r2490 100 100 COUT(3) << "G.St.Man: need additional memory" << std::endl; 101 101 ObjectList<Synchronisable>::iterator temp = it; 102 int addsize=tempsize;102 uint32_t addsize=tempsize; 103 103 while(++temp) 104 104 addsize+=temp->getSize(id, mode); … … 399 399 newobjectheader = (synchronisableHeader*)newdata; 400 400 if ( (*it).objSize == 0 ) 401 { 402 ++it; 401 403 continue; 404 } 402 405 // object = Synchronisable::getSynchronisable( (*it).objID ); 403 406 // assert(object->objectID == oldobjectheader->objectID); … … 418 421 // origdata += objectsize; 419 422 } 423 #ifndef NDEBUG 424 uint32_t origsize = destsize; 425 while ( origsize < HEADER->datasize ) 426 { 427 oldobjectheader = (synchronisableHeader*)origdata; 428 objectsize = oldobjectheader->size; 429 origdata += objectsize; 430 origsize += objectsize; 431 } 432 assert(origsize==HEADER->datasize); 433 assert(destsize!=0); 434 #endif 420 435 ((GamestateHeader*)gdata)->datasize = destsize; 421 assert(destsize==HEADER->datasize);422 assert(destsize!=0);423 436 return gs; 424 437 } -
code/branches/presentation/src/network/packet/Welcome.h
r2171 r2490 42 42 { 43 43 public: 44 Welcome( u nsigned int clientID, unsigned int shipID );45 Welcome( uint8_t* data, u nsigned int clientID );44 Welcome( uint32_t clientID, uint32_t shipID ); 45 Welcome( uint8_t* data, uint32_t clientID ); 46 46 virtual ~Welcome(); 47 47
Note: See TracChangeset
for help on using the changeset viewer.