Changeset 2133 for code/branches/objecthierarchy

Timestamp:

Nov 4, 2008, 6:39:03 PM (16 years ago)

Author:

scheusso

Message:

corrected some problems with objectID's on client and asserts

File:

• code/branches/objecthierarchy/src/network/Synchronisable.cc (modified) (2 diffs)

code/branches/objecthierarchy/src/network/Synchronisable.cc

@@ -69 +69 @@
     objectFrequency_=1;
     objectMode_=0x1; // by default do not send data to server
-    objectID=idCounter++;
+    if(Host::running() && Host::isServer())
+      objectID=idCounter++; //this is only needed when running a server
+    else
+      objectID=OBJECTID_UNKNOWN;
     classID = (unsigned int)-1;
     syncList = new std::list<synchronisableVariable *>;
+    
+#ifndef NDEBUG
+    ObjectList<Synchronisable>::iterator it;
+    for(it = ObjectList<Synchronisable>::begin(); it!=ObjectList<Synchronisable>::end(); ++it){
+      if( it->getObjectID()==this->objectID )
+        assert(*it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0));
+    }
+#endif
 
     this->creatorID = OBJECTID_UNKNOWN;
@@ -170 +181 @@
         creator = dynamic_cast<BaseObject*>(synchronisable_creator);
     }
+    assert(getSynchronisable(header->objectID)==0);   //make sure no object with this id exists
     BaseObject *bo = id->fabricate(creator);
     assert(bo);