Changeset 2904 for code/trunk/src/orxonox/objects/worldentities/pawns

Timestamp:

Apr 6, 2009, 4:50:31 PM (16 years ago)

Author:

scheusso

Message:

reverted changes from 2902

Location:

code/trunk/src/orxonox/objects/worldentities/pawns

Files:

• Pawn.cc (modified) (2 diffs)
• TeamBaseMatchBase.h (deleted)

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -198 +198 @@
     void Pawn::death()
     {
-        this->setHealth(1);
         if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
         {
@@ -215 +214 @@
                 this->deatheffect();
         }
+        else
+            this->setHealth(1);
     }