Changeset 2167 for code/branches

Timestamp:

Nov 9, 2008, 5:33:40 PM (16 years ago)

Author:

landauf

Message:

fixed attach bug

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc (modified) (3 diffs)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -59 +59 @@
 
         this->parent_ = 0;
-        this->parentID_ = (unsigned int)-1;
+        this->parentID_ = OBJECTID_UNKNOWN;
 
         this->node_->setPosition(Vector3::ZERO);
@@ -108 +108 @@
     void WorldEntity::updateParent()
     {
-        WorldEntity* parent = dynamic_cast<WorldEntity*>(Synchronisable::getSynchronisable(this->parentID_));
-        if (parent)
-            this->attachToParent(parent);
+        if (this->parentID_ != OBJECTID_UNKNOWN)
+        {
+            WorldEntity* parent = dynamic_cast<WorldEntity*>(Synchronisable::getSynchronisable(this->parentID_));
+            if (parent)
+                this->attachToParent(parent);
+        }
     }
 
@@ -135 +138 @@
         this->children_.erase(object);
         object->parent_ = 0;
-        object->parentID_ = (unsigned int)-1;
+        object->parentID_ = OBJECTID_UNKNOWN;
 
 //        this->getScene()->getRootSceneNode()->addChild(object->node_);