Changeset 8549 for code/branches/gameimmersion/src/orxonox/worldentities

Timestamp:

May 23, 2011, 5:46:47 PM (13 years ago)

Author:

simonmie

Message:

some more comments, fixed initial damage missetting

File:

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

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

@@ -235 +235 @@
     void Pawn::damage(float damage, Pawn* originator)
     {
+                COUT(3) << "### alte damage-funktion ###" << endl;
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
         {
@@ -246 +247 @@
                 healthdamage += shielddamage-this->getShieldHealth();
                 this->setShieldHealth(0);
-                COUT(3) << "### SHIELD KAPUTT ###" << endl;
             }