Changeset 7080 for code/branches

Timestamp:

Jun 2, 2010, 2:16:11 AM (14 years ago)

Author:

landauf

Message:

fixed bug in FpsPlayer, weaponNode wasn't destroyed. this fixes a crash after unloading an fps level.

File:

• code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) (1 diff)

code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.cc

@@ -93 +93 @@
     FpsPlayer::~FpsPlayer()
     {
-        if (this->isInitialized() && this->mesh_.getEntity())
-            this->detachOgreObject(this->mesh_.getEntity());
+        if (this->isInitialized())
+        {
+            if (this->mesh_.getEntity())
+                this->detachOgreObject(this->mesh_.getEntity());
+
+            if (this->weaponNode_ && this->getScene()->getSceneManager())
+                this->getScene()->getSceneManager()->destroySceneNode(this->weaponNode_->getName());
+        }
     }