[Orxonox-commit 7127] r11744 - in code/branches/Presentation_HS17_merge: . data/levels src/orxonox/gametypes src/orxonox/infos

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-14 23:44:50 +0100 (Wed, 14 Feb 2018)
New Revision: 11744

Removed:
   code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel
   code/branches/Presentation_HS17_merge/svn-commit.tmp
Modified:
   code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc
   code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h
   code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc
Log:
[CampaignMap_HS17] reverted some unwanted changes

Deleted: code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel
===================================================================
Modified: code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc	2018-02-14 22:31:43 UTC (rev 11743)
+++ code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc	2018-02-14 22:44:50 UTC (rev 11744)
@@ -30,7 +30,6 @@
 
 #include "items/Engine.h"
 #include "controllers/ArtificialController.h"
-#include "controllers/NewHumanController.h"
 
 #include "core/CoreIncludes.h"
 #include "core/command/ConsoleCommandIncludes.h"
@@ -48,7 +47,6 @@
     StoryMode::StoryMode(Context* context) : Gametype(context)
     {
         RegisterObject(StoryMode);
-        orxout() << "kill yourself1";
 
         this->gtinfo_ = new GametypeInfo(context);
         this->bAutoStart_ = true;
@@ -61,11 +59,12 @@
     {
         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!
             mission->end();
@@ -72,7 +71,6 @@
         }
         //Gametype::end();
     }
-
 /*
     void Mission::setTeams()
     { //Set pawn-colours

Modified: code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h	2018-02-14 22:31:43 UTC (rev 11743)
+++ code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h	2018-02-14 22:44:50 UTC (rev 11744)
@@ -40,7 +40,6 @@
             StoryMode(Context* context);
             virtual ~StoryMode() {}
             static void exit();
-//            virtual void playerEntered(PlayerInfo* player);
 
             
     };

Modified: code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc	2018-02-14 22:31:43 UTC (rev 11743)
+++ code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc	2018-02-14 22:44:50 UTC (rev 11744)
@@ -99,7 +99,6 @@
             "Karl the Llama",
             "Thomas the Tankengine",
             "Rick",
-            "send nudes",
             "Morty",
             "Charlie the Unicorn",
             "Kung Fury",

Deleted: code/branches/Presentation_HS17_merge/svn-commit.tmp
===================================================================
--- code/branches/Presentation_HS17_merge/svn-commit.tmp	2018-02-14 22:31:43 UTC (rev 11743)
+++ code/branches/Presentation_HS17_merge/svn-commit.tmp	2018-02-14 22:44:50 UTC (rev 11744)
@@ -1,4 +0,0 @@
-
---This line, and those below, will be ignored--
-
-M    data/levels/emptyLevel.oxw