Changeset 5839 for code/branches/core5/src/libraries/network

Timestamp:

Sep 30, 2009, 12:42:28 PM (15 years ago)

Author:

scheusso

Message:

Fixed problem with scene and creators
creatorID is now always the objectID of the scene except for the case

• if the object is the scene (then the creatorID is OBJECTID_UNKNOWN)
• if the object is "above" the scene (e.g. level), then the cID is also OBJECTID_UNKNOWN

File:

• code/branches/core5/src/libraries/network/synchronisable/Synchronisable.cc (modified) (4 diffs)

code/branches/core5/src/libraries/network/synchronisable/Synchronisable.cc

@@ -72 +72 @@
 
     // get creator id
-    this->creatorID = OBJECTID_UNKNOWN;
-
-    searchcreatorID:
+    if( creator )
+      this->creatorID = creator->getSceneID();
+    else
+      this->creatorID = OBJECTID_UNKNOWN;
+
+    /*searchcreatorID:
     if (creator)
     {
@@ -80 +83 @@
         if (synchronisable_creator && synchronisable_creator->objectMode_)
         {
-            this->creatorID = synchronisable_creator->getObjectID();
+            this->creatorID = synchronisable_creator->getScene()->getObjectID();
         }
         else if (creator != creator->getCreator())
@@ -87 +90 @@
             goto searchcreatorID;
         }
-    }
+    }*/
   }
 
@@ -173 +176 @@
     assert(no);
     no->objectID=header.getObjectID();
-    no->creatorID=header.getCreatorID(); //TODO: remove this
+    //no->creatorID=header.getCreatorID(); //TODO: remove this
     no->classID=header.getClassID();
+    assert(no->creatorID == header.getCreatorID());
+    //assert(no->classID == header.getClassID());
     COUT(4) << "fabricate objectID: " << no->objectID << " classID: " << no->classID << std::endl;
           // update data and create object/entity...