Changeset 2904 for code

Timestamp:

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

Author:

scheusso

Message:

reverted changes from 2902

Location:

code/trunk/src/orxonox/objects

Files:

• gametypes/TeamBaseMatch.cc (deleted)
• gametypes/TeamBaseMatch.h (deleted)
• gametypes/TeamDeathmatch.cc (modified) (1 diff)
• gametypes/TeamDeathmatch.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (2 diffs)
• worldentities/pawns/TeamBaseMatchBase.h (deleted)

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc

@@ -189 +189 @@
         return false;
     }
-
-    int TeamDeathmatch::getTeam(PlayerInfo* player)
-    {
-        std::map<PlayerInfo*, int>::const_iterator it_player = this->teamnumbers_.find(player);
-        if (it_player != this->teamnumbers_.end())
-            return it_player->second;
-        else
-            return -1;
-    }
 }

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h

@@ -58 +58 @@
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
             bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
-            int getTeam(PlayerInfo* player);
 
             std::map<PlayerInfo*, int> teamnumbers_;

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);
     }