Changeset 10023 for code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

Apr 9, 2014, 9:50:45 PM (11 years ago)

Author:

noep

Message:

ShipParts can "die" and detach the corresponding Entity while doing so. Issue: The Entity being detached while a hit on a collisionshape is being handled causes a runtime-error.

File:

• code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

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

@@ -252 +252 @@
     void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
     {
-        orxout() << "damage(): Collision detected on " << this->getName() << ", btCS*: " << cs << endl;
-
-        int collisionShapeIndex = this->isMyCollisionShape(cs);
-        orxout() << collisionShapeIndex << endl;
+        //FIXME: (noep) remove debug
+        //orxout() << "damage(): Collision detected on " << this->getName() << ", btCS*: " << cs << endl;
+
+        //int collisionShapeIndex = this->isMyCollisionShape(cs);
+        //orxout() << collisionShapeIndex << endl;
 
         // Applies multiplier given by the DamageBoost Pickup.
@@ -587 +588 @@
         // List all attached Objects
         orxout() << "  " << this->getName() << " has the following Objects attached:" << endl;
-        for (int i=0; i<10; i++)
+        for (int i=0; i<50; i++)
         {
             if (this->getAttachedObject(i)==NULL)