Changeset 2903 for code/branches/gametypes/src/orxonox/objects/worldentities

Timestamp:

Apr 6, 2009, 4:48:32 PM (15 years ago)

Author:

scheusso

Message:

merged changes made to trunk (r2902) into branch

Location:

code/branches/gametypes/src/orxonox/objects/worldentities/pawns

Files:

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

code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Pawn.cc

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