Changeset 11744 for code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc

Timestamp:

Feb 14, 2018, 11:44:50 PM (6 years ago)

Author:

landauf

Message:

[CampaignMap_HS17] reverted some unwanted changes

File:

• code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc (modified) (4 diffs)

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

@@ -31 +31 @@
 #include "items/Engine.h"
 #include "controllers/ArtificialController.h"
-#include "controllers/NewHumanController.h"
 
 #include "core/CoreIncludes.h"
@@ -49 +48 @@
     {
         RegisterObject(StoryMode);
-        orxout() << "kill yourself1";
 
         this->gtinfo_ = new GametypeInfo(context);
@@ -62 +60 @@
         Gametype::start();
 
-        this->gtinfo_->sendAnnounceMessage("send nudes");
+        this->gtinfo_->sendAnnounceMessage("Marvin isch Chef");
     }
 */
     void StoryMode::exit()
     {
+        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!
@@ -73 +72 @@
         //Gametype::end();
     }
-
 /*
     void Mission::setTeams()