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

Timestamp:

Nov 10, 2010, 9:59:50 PM (15 years ago)

Author:

jo

Message:

NON-compiling version. Work in Progress.

Location:

code/branches/lastmanstanding/src/orxonox/gametypes

Files:

• LastManStanding.cc (modified) (2 diffs)
• LastManStanding.h (modified) (2 diffs)

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)
+    {
+        if (player)
+            return  playerLives_[player];
+        else
+            return 0;
+    }
 
     void LastManStanding::playerEntered(PlayerInfo* player)
@@ -224 +241 @@
     }
 
-    const int LastManStanding::playerGetLives(PlayerInfo* player)
-    {
-        if (player)
-            return  playerLives_[player];
-        else
-            return 0;
-    }
-
     void LastManStanding::punishPlayer(PlayerInfo* player)
     {

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_".
             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.
@@ -78 +80 @@
             virtual void playerStopsControllingPawn(PlayerInfo* player, Pawn* pawn);  //!< Manages the gametype's HUD. #Players alive via StaticMessage.
 
-            const int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
             void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining".
             void tick (float dt); //!< used to end the game