Changeset 2497 for code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc

Timestamp:

Dec 17, 2008, 5:41:29 AM (16 years ago)

Author:

landauf

Message:

• some changes, maybe fixed a crash, not sure
• fixed strange camera behavior

File:

• code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) (1 diff)

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

@@ -104 +104 @@
             this->node_->removeAllChildren();
 
+            if (this->physicalBody_)
+            {
+                this->deactivatePhysics();
+                delete this->physicalBody_;
+            }
+            delete this->collisionShape_;
+
             if (this->getScene()->getSceneManager())
                 this->getScene()->getSceneManager()->destroySceneNode(this->node_->getName());
-
-            // TODO: Detach from parent and detach all children.
-
-            if (this->physicalBody_)
-            {
-                this->deactivatePhysics();
-                delete this->physicalBody_;
-            }
-            delete this->collisionShape_;
         }
     }