Changeset 10068 for code/branches

Timestamp:

May 22, 2014, 1:12:35 PM (11 years ago)

Author:

smerkli

Message:

Introduced a shippartmanager to hopefully fix the segfaults

Location:

code/branches/modularships/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• ShipPartManager.cc (added)
• ShipPartManager.h (added)
• items/ShipPart.cc (modified) (2 diffs)

code/branches/modularships/src/orxonox/CMakeLists.txt

@@ -31 +31 @@
   PawnManager.cc
   PlayerManager.cc
+  ShipPartManager.cc
   Radar.cc
 #  Test.cc

code/branches/modularships/src/orxonox/items/ShipPart.cc

@@ -85 +85 @@
     void ShipPart::death()
     {
-        if (!(this->isAlive()))
-            return;
+        //if (!(this->isAlive()))
+            //return;
 
         this->explode();
@@ -232 +232 @@
         }
         if (this->health_ < 0)
-            this->death();
+            this->alive_ = false;
+            //this->death();
 
         // (Ugly) Chatoutput of health, until a GUI for modularspaceships-shipparts is implemented.