Changeset 9729 for code/trunk

Timestamp:

Oct 31, 2013, 10:18:39 PM (11 years ago)

Author:

jo

Message:

Creating new console command to set the lives in a mission.

Location:

code/trunk/src/orxonox/gametypes

Files:

• Mission.cc (modified) (3 diffs)
• Mission.h (modified) (2 diffs)

code/trunk/src/orxonox/gametypes/Mission.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/command/ConsoleCommand.h"
+#include "infos/PlayerInfo.h"
 #include "network/Host.h"
 #include "worldentities/pawns/Pawn.h"
+
 
 namespace orxonox
 {
     SetConsoleCommand("Mission", "endMission", &Mission::endMission);
+    SetConsoleCommand("Mission", "setLives", &Mission::setLivesWrapper);
     RegisterUnloadableClass(Mission);
 
@@ -62 +65 @@
     void Mission::pawnKilled(Pawn* victim, Pawn* killer)
     {
-        if (victim && victim->getPlayer() && this->lives_ == 1)
+        if (victim && victim->getPlayer() && victim->getPlayer()->isHumanPlayer() )
         {
-            this->missionAccomplished_ = false;
-            this->end();
+            this->lives_--;
+            if (this->lives_ == 0)
+            {
+                this->missionAccomplished_ = false;
+                this->end();
+            }
         }
     }
@@ -103 +110 @@
         }
     }
+    
+    void Mission::setLivesWrapper(unsigned int amount)
+    {
+        for (ObjectList<Mission>::iterator it = ObjectList<Mission>::begin(); it != ObjectList<Mission>::end(); ++it)
+        {//TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would affect ALL missions!
+            it->setLives(amount);
+        }
+    }
 
 

code/trunk/src/orxonox/gametypes/Mission.h

@@ -55 +55 @@
                 {this->missionAccomplished_ = acc;}
             static void endMission(bool accomplished);
+            static void setLivesWrapper(unsigned int amount);
 
         protected:
@@ -60 +61 @@
             bool missionAccomplished_; //<! indicates if player successfully finsihed the mission;
             int lives_; //<! amount of player's lives <-> nr. of retries
-            //Make end() a callback function to the event "END"
-            //or create a console command.
-
+            //<! If the lives_ are set negative -> unlimited lives.
     };
 }