Changeset 10214 for code/branches/presentationFS14/src

Timestamp:

Jan 31, 2015, 4:54:16 PM (10 years ago)

Author:

landauf

Message:

fixed segfault. after removing the engine from the ship, we need to destroy it. otherwise the engine remains in the object lists and will be destroyed at the end of the game - but at this point the ship may not exist anymore, leading to a crash.

Location:

code/branches/presentationFS14/src/orxonox

Files:

• items/PartDestructionEvent.cc (modified) (1 diff)
• worldentities/pawns/SpaceShip.cc (modified) (1 diff)

code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.cc

@@ -121 +121 @@
             switch (this->targetParam_) {
             case null:
-                this->parent_->getParent()->removeEngine(this->parent_->getParent()->getEngineByName(targetName_));
+                this->parent_->getParent()->getEngineByName(targetName_)->destroy();
                 break;
             case boostfactor:

code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -373 +373 @@
     @param engine
         A pointer to the Engine to be removed.
+    @note
+        Don't forget to reset the Engine's ship pointer after it was removed (or destroy the engine).
     */
     void SpaceShip::removeEngine(Engine* engine)