Changeset 2832 for code/branches/netp/src/network
- Timestamp:
- Mar 23, 2009, 2:53:10 PM (16 years ago)
- Location:
- code/branches/netp/src/network
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/netp/src/network/packet/Gamestate.cc
r2773 r2832 107 107 for(it = ObjectList<Synchronisable>::begin(); it; ++it){ 108 108 109 tempsize=it->getSize(id, mode); 109 // tempsize=it->getSize(id, mode); 110 111 tempsize = it->getData(mem, id, mode); 112 if ( it->doSync( id, mode ) ) 113 dataMap_.push_back( obj(it->getObjectID(), it->getCreatorID(), tempsize, mem-data_) ); 114 110 115 #ifndef NDEBUG 111 116 if(currentsize+tempsize > size){ … … 123 128 }// stop allocate additional memory 124 129 #endif 125 126 if ( it->doSync( id, mode ) ) 127 dataMap_.push_back( obj(it->getObjectID(), it->getCreatorID(), tempsize, mem-data_) ); 128 if(!it->getData(mem, id, mode)) 129 return false; // mem pointer gets automatically increased because of call by reference 130 // if(!it->getData(mem, id, mode)) 131 // return false; // mem pointer gets automatically increased because of call by reference 130 132 // increase size counter by size of current synchronisable 131 133 currentsize+=tempsize; -
code/branches/netp/src/network/synchronisable/Synchronisable.cc
r2823 r2832 238 238 * @return true: if !doSync or if everything was successfully saved 239 239 */ 240 boolSynchronisable::getData(uint8_t*& mem, int32_t id, uint8_t mode){240 uint32_t Synchronisable::getData(uint8_t*& mem, int32_t id, uint8_t mode){ 241 241 if(mode==0x0) 242 242 mode=state_; 243 243 //if this tick is we dont synchronise, then abort now 244 244 if(!doSync(id, mode)) 245 return true;245 return 0; 246 246 uint32_t tempsize = 0; 247 247 if (this->classID==0) … … 279 279 assert(tempsize==size); 280 280 #endif 281 return t rue;281 return tempsize; 282 282 } 283 283 -
code/branches/netp/src/network/synchronisable/Synchronisable.h
r2823 r2832 147 147 148 148 private: 149 boolgetData(uint8_t*& men, int32_t id, uint8_t mode=0x0);149 uint32_t getData(uint8_t*& men, int32_t id, uint8_t mode=0x0); 150 150 uint32_t getSize(int32_t id, uint8_t mode=0x0); 151 151 bool updateData(uint8_t*& mem, uint8_t mode=0x0, bool forceCallback=false);
Note: See TracChangeset
for help on using the changeset viewer.