Changeset 7605 for code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h

Timestamp:

Nov 2, 2010, 10:34:07 PM (14 years ago)

Author:

jo

Message:

Various successful changes. But the part I commented out in punishPlayer(PlayerInfo* player) causes crashes.

File:

• code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) (2 diffs)

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

@@ -58 +58 @@
             std::map<PlayerInfo*, float> playerDelayTime_; //!< Stores each Player's delay time.
             std::map<PlayerInfo*, bool> inGame_; //!< Indicates each Player's state.
-            virtual void spawnDeadPlayersIfRequested(); //!< Prevents dead players to respawn
+            bool noPunishment;
+            bool hardPunishment;
+            float punishDamageRate;
+            virtual void spawnDeadPlayersIfRequested(); //!< Prevents dead players to respawn.
+            virtual int getMinLives(); //!< Returns minimum of each player's lives; players with 0 lives are skipped; 
 
         public:
@@ -75 +79 @@
 
             const int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
-            void killPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining".
+            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
     };