Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11744


Ignore:
Timestamp:
Feb 14, 2018, 11:44:50 PM (7 years ago)
Author:
landauf
Message:

[CampaignMap_HS17] reverted some unwanted changes

Location:
code/branches/Presentation_HS17_merge
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

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

    r11743 r11744  
    3131#include "items/Engine.h"
    3232#include "controllers/ArtificialController.h"
    33 #include "controllers/NewHumanController.h"
    3433
    3534#include "core/CoreIncludes.h"
    … …  
    4948    {
    5049        RegisterObject(StoryMode);
    51         orxout() << "kill yourself1";
    5250
    5351        this->gtinfo_ = new GametypeInfo(context);
    … …  
    6260        Gametype::start();
    6361
    64         this->gtinfo_->sendAnnounceMessage("send nudes");
     62        this->gtinfo_->sendAnnounceMessage("Marvin isch Chef");
    6563    }
    6664*/
    6765    void StoryMode::exit()
    6866    {
     67        orxout() << "s funktioniert"<< endl;
    6968        for (StoryMode* mission : ObjectList<StoryMode>())
    7069        { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
    … …  
    7372        //Gametype::end();
    7473    }
    75 
    7674/*
    7775    void Mission::setTeams()

  • code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h

    r11743 r11744  
    4141            virtual ~StoryMode() {}
    4242            static void exit();
    43 //            virtual void playerEntered(PlayerInfo* player);
    4443
    4544           

  • code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc

    r11743 r11744  
    100100            "Thomas the Tankengine",
    101101            "Rick",
    102             "send nudes",
    103102            "Morty",
    104103            "Charlie the Unicorn",
Note: See TracChangeset for help on using the changeset viewer.