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

Timestamp:

May 23, 2009, 9:57:52 PM (16 years ago)

Author:

landauf

Message:

merged gametypes branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/pawns/Destroyer.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc)
• src/orxonox/objects/worldentities/pawns/Destroyer.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc)
• src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h)

code/trunk/src/orxonox/objects/worldentities/pawns/CMakeLists.txt

@@ -3 +3 @@
   Pawn.cc
   SpaceShip.cc
+  TeamBaseMatchBase.cc
+  Destroyer.cc
 )

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_))
         {
@@ -214 +215 @@
                 this->deatheffect();
         }
-        else
-            this->setHealth(1);
     }