Changeset 10071 for code/branches/modularships/src/orxonox/worldentities

Timestamp:

May 22, 2014, 2:18:47 PM (11 years ago)

Author:

noep

Message:

Removed all segfaults (or at least those we found…)

Location:

code/branches/modularships/src/orxonox/worldentities/pawns

Files:

• ModularSpaceShip.cc (modified) (3 diffs)
• ModularSpaceShip.h (modified) (1 diff)

code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc

@@ -50 +50 @@
 namespace orxonox
 {
-    SetConsoleCommand("ModularSpaceShip", "killshippart", &ModularSpaceShip::killShipPart);
+    SetConsoleCommand("ModularSpaceShip", "killshippart", &ModularSpaceShip::killShipPartStatic);
 
     RegisterClass(ModularSpaceShip);
@@ -174 +174 @@
     /**
     @brief
+        STATIC: Needed for consolecommand. Kills the ShipPart with the given name. Used from the console-command "ModularSpaceShip killshippart [string]".
+    @param name
+        The name of the part to be killed.
+    */
+    void ModularSpaceShip::killShipPartStatic(std::string name)
+    {
+        for (std::map<StaticEntity*, ShipPart*>::const_iterator it = ModularSpaceShip::partMap_s->begin(); it != ModularSpaceShip::partMap_s->end(); ++it)
+        {
+            if (it->second->getName() == name)
+            {
+                it->second->setAlive(false);
+                return;
+            }
+        }
+        orxout(internal_warning) << "Could not apply damage to ShipPart \"" << name << "\". Part not found." << endl;
+    }
+
+    /**
+    @brief
         Kills the ShipPart with the given name. Used from the console-command "ModularSpaceShip killshippart [string]".
     @param name
@@ -180 +199 @@
     void ModularSpaceShip::killShipPart(std::string name)
     {
-        for (std::map<StaticEntity*, ShipPart*>::const_iterator it = ModularSpaceShip::partMap_s->begin(); it != ModularSpaceShip::partMap_s->end(); ++it)
+        for (std::map<StaticEntity*, ShipPart*>::const_iterator it = ModularSpaceShip::partMap_.begin(); it != ModularSpaceShip::partMap_.end(); ++it)
         {
             if (it->second->getName() == name)
             {
-                it->second->death();
+                it->second->setAlive(false);
                 return;
             }

code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h

@@ -113 +113 @@
             virtual void damage(float damage, float healthdamage = 0.0f, float shielddamage = 0.0f, Pawn* originator = NULL, const btCollisionShape* cs = NULL);
 
-            static void killShipPart(std::string name);
+            static void killShipPartStatic(std::string name);
+            void killShipPart(std::string name);
 
             void addShipPart(ShipPart* part);