Changeset 7542 for code/branches/lastmanstanding/src

Timestamp:

Oct 14, 2010, 11:02:57 PM (14 years ago)

Author:

jo

Message:

Some cleanup. There's still a nasty bug.

Location:

code/branches/lastmanstanding/src/orxonox/gametypes

Files:

• LastManStanding.cc (modified) (6 diffs)
• LastManStanding.h (modified) (3 diffs)

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

@@ -48 +48 @@
     }
 
+    void LastManStanding::spawnDeadPlayersIfRequested()
+    {
+        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
+            if (it->second.state_ == PlayerState::Dead)
+            {
+                bool alive = (0<playerLives_[it->first]);
+                if (alive&&(it->first->isReadyToSpawn() || this->bForceSpawn_))
+                    this->spawnPlayer(it->first);
+             }
+    }
+
+
     void LastManStanding::setConfigValues()
     {
@@ -66 +78 @@
     bool LastManStanding::allowPawnDeath(Pawn* victim, Pawn* originator)
     {
-        if (!victim)// only for safety
+        if (!victim||!victim->getPlayer())// only for safety
             return true;
-        playerLives_[victim->getPlayer()]--;
-        if (!playerLives_[victim->getPlayer()])//if player lost all lives
+        playerLives_[victim->getPlayer()]=playerLives_[victim->getPlayer()]-1;
+        if (playerLives_[victim->getPlayer()]<=0)//if player lost all lives
         {
             this->playersAlive--;
@@ -183 +195 @@
         if(!player)
             return;
-        std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
+        std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);//!!!!!!!!!!!
         if (it != this->players_.end())
         {
@@ -189 +201 @@
             it->second.killed_++;
 
-            playerLives_[player]--;//-----------datapart
-            if (!playerLives_[player])//if player lost all lives
+            playerLives_[player]=playerLives_[player]-1;//-----------datapart
+            if (playerLives_[player]<=0)//if player lost all lives
             {
                 this->playersAlive--;
-                const std::string& message = player->getName() + " has lost all lives";
+                const std::string& message = player->getName() + " is out";
                 COUT(0) << message << std::endl;
                 Host::Broadcast(message);
             }
+            this->timeToAct_[player]=timeRemaining+3.0f;//reset timer
         }
     }
@@ -215 +228 @@
                 if (it->second<0.0f)
                 {
-                    it->second=timeRemaining+3.0f;
-                    this->killPlayer(it->first);
+                    it->second=timeRemaining+3.0f;//reset timer
+                    if (playerGetLives(it->first)>0)
+                        this->killPlayer(it->first);
                 }
             }
@@ -222 +236 @@
     }
 
-    void LastManStanding::spawnDeadPlayersIfRequested()
-    {
-        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
-            if (it->second.state_ == PlayerState::Dead)
-            {
-                bool alive = (0<playerLives_[it->first]);
-                if (alive&&(it->first->isReadyToSpawn() || this->bForceSpawn_))
-                    this->spawnPlayer(it->first);
-             }
-    }
-
 }

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

@@ -60 +60 @@
             float timeRemaining; //!< Each player has a certain time where he or she has to hit an opponent or will be punished.
             std::map<PlayerInfo*, float> timeToAct_; //!< Each player's time till she/he will be punished is stored here.
-            virtual void spawnDeadPlayersIfRequested();
+            virtual void spawnDeadPlayersIfRequested(); //!< Prevents dead players to respawn
 
         public:
@@ -67 +67 @@
             void setConfigValues(); //!< Makes values configurable.
 
-            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0); //!< If a player shoot's an opponet, his punishment countdown will be resetted.
-            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0); //!< Manages each lives.
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
+            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0); //!< Manages each players lives.
 
             virtual void start(); //!< Sends a start message.
@@ -78 +78 @@
             virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
 
-            const int playerGetLives(PlayerInfo* player);
-            void killPlayer(PlayerInfo* player);
-            void tick (float dt);// used to end the game
+            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 tick (float dt); //!< used to end the game
     };
 }