Changeset 7636 for code/branches/lastmanstanding/src/orxonox

Timestamp:

Nov 11, 2010, 1:35:49 AM (14 years ago)

Author:

landauf

Message:

compiles and works

Location:

code/branches/lastmanstanding/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• gametypes/LastManStanding.cc (modified) (2 diffs)
• gametypes/LastManStanding.h (modified) (1 diff)

code/branches/lastmanstanding/src/orxonox/OrxonoxPrereqs.h

@@ -93 +93 @@
     class Dynamicmatch;
     class Gametype;
+    class LastManStanding;
     class TeamBaseMatch;
     class TeamDeathmatch;

code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc

@@ -147 +147 @@
     }
 
-    int LastManStanding::pawnGetLives(Pawn* pawn)
-    {
-        if(!pawn)
-            return -1;
-        PlayerInfo* player= dynamic_cast<PlayerInfo*>(pawn);
-        if(!player)
-            return -2;
-        return playerLives_[player];
-    }
-
-    const int LastManStanding::playerGetLives(PlayerInfo* player)
+    int LastManStanding::playerGetLives(PlayerInfo* player)
     {
         if (player)
@@ -163 +153 @@
         else
             return 0;
+    }
+    
+    int LastManStanding::getNumPlayersAlive() const
+    {
+        return this->playersAlive;
     }
 

code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h

@@ -73 +73 @@
 
             virtual void end(); //!< Sends an end message.
-            virtual int pawnGetLives(Pawn* pawn); //!< Returns amount of Lives of a certain player.
-            const int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
+            int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
+            int getNumPlayersAlive() const; //!< Returns the number of players that are still alive.
             virtual void playerEntered(PlayerInfo* player); //!< Initializes values. Manages the gametype's HUD. #Players alive via StaticMessage.
             virtual bool playerLeft(PlayerInfo* player); //!< Manages the gametype's HUD. #Players alive via StaticMessage.