Changeset 9728 for code/trunk

Timestamp:

Oct 29, 2013, 8:56:38 PM (11 years ago)

Author:

jo

Message:

Making a Mission endable by a ConsoleCommand such that it can be ended from within a level.

Location:

code/trunk/src/orxonox/gametypes

Files:

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

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

@@ -32 +32 @@
 
 #include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommand.h"
 #include "network/Host.h"
 #include "worldentities/pawns/Pawn.h"
@@ -37 +38 @@
 namespace orxonox
 {
+    SetConsoleCommand("Mission", "endMission", &Mission::endMission);
     RegisterUnloadableClass(Mission);
 
@@ -78 +80 @@
     {
         Gametype::end();
-        /*if (this->missionAccomplished_)
+        if (this->missionAccomplished_)
             this->gtinfo_->sendAnnounceMessage("Mission accomplished!");
         else
             this->gtinfo_->sendAnnounceMessage("Mission failed!");
-        */
     }
 
@@ -94 +95 @@
         }
     }
-
+    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();
+        }
+    }
 
 

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

@@ -52 +52 @@
             inline unsigned int getLives()
                 {return this->lives_;}
+            inline void setMissionAccomplished(bool acc)
+                {this->missionAccomplished_ = acc;}
+            static void endMission(bool accomplished);
 
         protected:
@@ -57 +60 @@
             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.
 
     };