Changeset 7581

Timestamp:

Oct 25, 2010, 10:21:53 PM (14 years ago)

Author:

jo

Message:

Almost finished. Yeay.

Location:

code/branches/lastmanstanding

Files:

• data/overlays/lastmanstandinghud.oxo (added)
• src/orxonox/gametypes/LastManStanding.cc (modified) (3 diffs)

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

@@ -236 +236 @@
             return 0;
     }
-    /*BUG-Description:
-    *There are two ways for a player to be killed: Either receiving damage, or through the following function.
-    *The function works fine - until the last call, when a player looses his last live. Than the kill part
-    *(it->second.state_ = PlayerState::Dead;) somehow isn't executed:
-    *The player isn't killed (he doesn't leave play). Although the corresponding code is reached.
-    *
-    *How to reproduce this bug: Start a new Lastmanstanding-Match. Immdiately add 8 bots(before actually entering the level).
-    *Just fly around and wait. Don't shoot, since only passive behaviour triggers the killPlayer-Function.
-    */
+
     void LastManStanding::killPlayer(PlayerInfo* player)
     {
@@ -252 +244 @@
         if (it != this->players_.end())
         {
-            if (playerLives_[player]<=1)//if player lost all lives
-            {
-                this->playersAlive--;
-                const std::string& message = player->getName() + " is out";
-                COUT(0) << message << std::endl;
-                Host::Broadcast(message);
-                playerLives_[player]=playerLives_[player]-1;//-----------datapart
-                it->second.killed_++;
-                it->second.state_ = PlayerState::Dead;//-------------killpart
-            }
-            else
-            {
-                playerLives_[player]=playerLives_[player]-1;//-----------datapart
-                it->second.killed_++;
-                it->second.state_ = PlayerState::Dead;//-------------killpart
-
-                this->timeToAct_[player]=timeRemaining+3.0f;//reset timer
-            }
-
+            if(!player->getControllableEntity())
+                {return;}
+            Pawn* pawn = dynamic_cast<Pawn*>(player->getControllableEntity());
+            if(!pawn)
+                {return;}
+            pawn->kill();
+            this->timeToAct_[player]=timeRemaining+3.0f;//reset timer
         }
     }
@@ -277 +257 @@
     {
         SUPER(LastManStanding, tick, dt);
-        if(!this->hasEnded())
-        {
-            if ((this->hasStarted()&&(playersAlive==1)))//last player remaining
+        if(this->hasStarted()&&(!this->hasEnded()))
+        {
+            if ((this->hasStarted()&&(playersAlive<=1)))//last player remaining
             {
             this->end();