- Timestamp:
- Feb 14, 2018, 11:31:43 PM (6 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge
- Property svn:mergeinfo changed
/code/branches/CampaignMap_HS17 (added) merged: 11458,11507,11512-11513,11525-11527,11544-11545,11560,11564,11584,11588,11605,11634,11636,11663,11675-11676
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc
r11359 r11743 31 31 #include "items/Engine.h" 32 32 #include "controllers/ArtificialController.h" 33 #include "controllers/NewHumanController.h" 33 34 34 35 #include "core/CoreIncludes.h" … … 48 49 { 49 50 RegisterObject(StoryMode); 51 orxout() << "kill yourself1"; 50 52 51 53 this->gtinfo_ = new GametypeInfo(context); … … 60 62 Gametype::start(); 61 63 62 this->gtinfo_->sendAnnounceMessage(" Marvin isch Chef");64 this->gtinfo_->sendAnnounceMessage("send nudes"); 63 65 } 64 66 */ 65 67 void StoryMode::exit() 66 68 { 67 orxout() << "s funktioniert"<< endl;68 69 for (StoryMode* mission : ObjectList<StoryMode>()) 69 70 { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions! … … 72 73 //Gametype::end(); 73 74 } 75 74 76 /* 75 77 void Mission::setTeams()
Note: See TracChangeset
for help on using the changeset viewer.