Changeset 11269 for code/branches/StoryModeMap_HS16/src/orxonox

Timestamp:

Nov 7, 2016, 3:56:14 PM (8 years ago)

Author:

jhuwyler

Message:

GSLevel hat den durchbruch gebracht. Die Level werden nun geladen und auch der back-Button funktioniert. Das naechste Mal muessen die Map arrangiert und die Buttons unsichtbar gemacht werden.

Location:

code/branches/StoryModeMap_HS16/src/orxonox/gametypes

Files:

• StoryMode.cc (modified) (2 diffs)
• StoryMode.h (modified) (1 diff)

code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc

@@ -42 +42 @@
 {
 
+    SetConsoleCommand("StoryMode", "exit", &StoryMode::exit);
     RegisterUnloadableClass(StoryMode);
     
@@ -61 +62 @@
         this->gtinfo_->sendAnnounceMessage("Marvin isch Chef");
     }
-
-   void StoryMode::end()
+*/
+    void StoryMode::exit()
     {
-        if (this->missionAccomplished_ && !this->gtinfo_->hasEnded())
-        {
-            this->gtinfo_->sendAnnounceMessage("StoryMode accomplished!");
-
-            LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
+        orxout() << "s funktioniert"<< endl;
+        for (StoryMode* mission : ObjectList<StoryMode>())
+        { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
+            mission->end();
         }
-        else if (!this->gtinfo_->hasEnded())
-            this->gtinfo_->sendAnnounceMessage("StoryMode failed!");
-
-        Gametype::end();
+        //Gametype::end();
     }
-
+/*
     void Mission::setTeams()
     { //Set pawn-colours

code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.h

@@ -40 +40 @@
             StoryMode(Context* context);
             virtual ~StoryMode() {}
+            static void exit();