Changeset 9733 for code/branches/levelKaan/src/orxonox/gametypes/Mission.cc

Timestamp:

Nov 1, 2013, 12:19:18 AM (11 years ago)

Author:

jo

Message:

Merged trunk into branch levelKaan to add new features for the gametype Mission.

Location:

code/branches/levelKaan

Files:

• . (modified) (1 prop)
• src/orxonox/gametypes/Mission.cc (modified) (4 diffs)

code/branches/levelKaan/src/orxonox/gametypes/Mission.cc

@@ -32 +32 @@
 
 #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);
 
@@ -56 +61 @@
             this->end();
         }
+        else if (this->lives_ == 0)
+        {
+            this->missionAccomplished_ = false;
+            this->end();
+        }
     }
 
     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_--;
         }
     }
@@ -78 +87 @@
     {
         Gametype::end();
-        /*if (this->missionAccomplished_)
+        if (this->missionAccomplished_)
             this->gtinfo_->sendAnnounceMessage("Mission accomplished!");
         else
             this->gtinfo_->sendAnnounceMessage("Mission failed!");
-        */
     }
 
@@ -94 +102 @@
         }
     }
-
+    void Mission::endMission(bool accomplished)
+    {
+        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 end ALL missions!
+            it->setMissionAccomplished(accomplished);
+            it->end();
+        }
+    }
+    
+    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);
+        }
+    }