Changeset 2464

Timestamp:

Dec 15, 2008, 3:14:07 PM (16 years ago)

Author:

rgrieder

Message:

Bugfix in network: When checking for other objectIDs, it was possible that within the constructor of one Synchronisable, another one was created. In the check then, both have objectID == OBJECTID_UNKNOWN because the objectID of the first object was not yet set (done after construction).

• Moved the check to Gamestate, after ALL objects of one packet have been created.

Location:

code/branches/presentation/src/network

Files:

• packet/Gamestate.cc (modified) (1 diff)
• synchronisable/Synchronisable.cc (modified) (1 diff)

code/branches/presentation/src/network/packet/Gamestate.cc

@@ -163 +163 @@
   }
 
+   // In debug mode, check first, whether there are no duplicate objectIDs
+#ifndef NDEBUG
+  ObjectList<Synchronisable>::iterator it;
+  for (it = ObjectList<Synchronisable>::begin(); it != ObjectList<Synchronisable>::end(); ++it) {
+    if (it->getObjectID() == OBJECTID_UNKNOWN) {
+      if (it->objectMode_ != 0x0) {
+        COUT(0) << "Found object with OBJECTID_UNKNOWN on the client with objectMode != 0x0!" << std::endl;
+        assert(false);
+      }
+    }
+    else {
+      ObjectList<Synchronisable>::iterator it2;
+      for (it2 = ObjectList<Synchronisable>::begin(); it2 != ObjectList<Synchronisable>::end(); ++it2) {
+        if (it->getObjectID() == it2->getObjectID() && *it != *it2) {
+           COUT(0) << "Found duplicate objectIDs on the client!" << std::endl
+                   << "Are you sure you don't create a Sychnronisable objcect with 'new' \
+                       that doesn't have objectMode = 0x0?" << std::endl;
+           assert(false);
+        }
+      }
+    }
+  }
+#endif
+
   return true;
 }

code/branches/presentation/src/network/synchronisable/Synchronisable.cc

@@ -80 +80 @@
     this->setPriority( priority::normal );
 
-    
     // get creator id
-#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;