[Orxonox-commit 6886] r11507 - in code/branches/CampaignMap_HS17: data/levels src/orxonox/gametypes

[fanconic at orxonox.net]

Author: fanconic
Date: 2017-10-23 16:12:10 +0200 (Mon, 23 Oct 2017)
New Revision: 11507

Modified:
   code/branches/CampaignMap_HS17/data/levels/StoryModeMap.oxw
   code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.cc
Log:
Es wurde eine neue Unterklasse von Planets erstellt, Names StoryModePlanet

Modified: code/branches/CampaignMap_HS17/data/levels/StoryModeMap.oxw
===================================================================
--- code/branches/CampaignMap_HS17/data/levels/StoryModeMap.oxw	2017-10-23 14:06:09 UTC (rev 11506)
+++ code/branches/CampaignMap_HS17/data/levels/StoryModeMap.oxw	2017-10-23 14:12:10 UTC (rev 11507)
@@ -12,8 +12,6 @@
   include("StoryModeHUD.oxo")
   include("templates/lodInformation.oxt")
   include("templates/StoryMode.oxt")
-
-  include("templates/lodInformation.oxt")
 ?>
 
 <Level

Modified: code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.cc
===================================================================
--- code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.cc	2017-10-23 14:06:09 UTC (rev 11506)
+++ code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.cc	2017-10-23 14:12:10 UTC (rev 11507)
@@ -59,7 +59,7 @@
     {
         Gametype::start();
 
-        this->gtinfo_->sendAnnounceMessage("Marvin isch Chef");
+        this->gtinfo_->sendAnnounceMessage("send nudes");
     }
 */
     void StoryMode::exit()