- Timestamp:
- Mar 8, 2009, 4:40:01 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network/src/network/synchronisable/Synchronisable.cc
r2749 r2758 100 100 if (this->objectMode_ != 0x0 && (Host::running() && Host::isServer())) 101 101 deletedObjects_.push(objectID); 102 // COUT(3) << "destruct synchronisable +++" << objectID << " | " << classID << std::endl;103 // COUT(3) << " bump ---" << objectID << " | " << &objectMap_ << std::endl;104 // assert(objectMap_[objectID]->objectID==objectID);105 // objectMap_.erase(objectID);106 102 } 107 103 std::map<uint32_t, Synchronisable*>::iterator it; … … 110 106 objectMap_.erase(it); 111 107 112 //HACK HACK HACK HACK HACK HACK113 // this hack ensures that children of this object also get destroyed114 // ObjectList<Synchronisable>::iterator it2, it3;115 // // get total size of gamestate116 // for(it2 = ObjectList<Synchronisable>::begin(); it2; ++it2)117 // {118 // if ( it2->getCreatorID() == this->objectID && it2->getCreatorID() != OBJECTID_UNKNOWN )119 // {120 // Synchronisable::deleteObject( it2->getObjectID() );121 // }122 // }123 //HACK HACK HACK HACK HACK HACK124 108 } 125 109 … … 205 189 */ 206 190 bool Synchronisable::deleteObject(uint32_t objectID){ 207 // assert(getSynchronisable(objectID));208 191 if(!getSynchronisable(objectID)) 209 192 return false; 210 193 assert(getSynchronisable(objectID)->objectID==objectID); 211 // delete objectMap_[objectID];212 194 Synchronisable *s = getSynchronisable(objectID); 213 195 if(s) … … 260 242 if(!doSync(id, mode)) 261 243 return true; 262 //std::cout << "inside getData" << std::endl;263 244 uint32_t tempsize = 0; 264 245 if (this->classID==0) … … 269 250 270 251 assert(this->classID==this->getIdentifier()->getNetworkID()); 271 // this->classID=this->getIdentifier()->getNetworkID(); // TODO: correct this272 252 std::list<SynchronisableVariableBase*>::iterator i; 273 253 uint32_t size; … … 307 287 mode=state_; 308 288 std::list<SynchronisableVariableBase *>::iterator i; 309 //assert(objectMode_!=0x0);310 //assert( (mode ^ objectMode_) != 0);311 289 if(syncList.empty()){ 312 290 assert(0);
Note: See TracChangeset
for help on using the changeset viewer.