Changeset 10071 for code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h

Timestamp:

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

Author:

noep

Message:

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

File:

• code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) (1 diff)

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);