Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10254


Ignore:
Timestamp:
Feb 3, 2015, 11:43:42 PM (5 years ago)
Author:
landauf
Message:

cleanup

Location:
code/branches/storymodeHS14
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua

    r10250 r10254  
    1919    P.createFilterTab("Tests", "test")
    2020    P.createFilterTab("Show All", nil)
    21    
    2221
    2322    -- update description and screenshot boxes
    2423    P.SingleplayerSelectionChanged()
    2524
    26     --buttons are arranged in a 1x4 matrix
     25    --buttons are arranged in a 2x3 matrix
    2726    P:setButton(1, 1, {
    2827            ["button"] = winMgr:getWindow("orxonox/SingleplayerStartButton"),
     
    3938            ["callback"]  = P.SingleplayerBackButton_clicked
    4039    })
    41     P:setButton(1, 4,{
     40
     41    P:setButton(2, 2,{
    4242            ["button"] = winMgr:getWindow("orxonox/CampaignButton"),
    4343            ["callback"] = P.CampaignButton_clicked
  • code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc

    r10253 r10254  
    2929#include "Mission.h"
    3030
    31 #include <boost/filesystem.hpp>
    32 
    3331#include "items/Engine.h"
    3432#include "controllers/ArtificialController.h"
     
    3634#include "core/CoreIncludes.h"
    3735#include "core/command/ConsoleCommand.h"
    38 #include "core/config/ConfigValueIncludes.h"
    3936#include "infos/PlayerInfo.h"
    4037#include "network/Host.h"
     
    8279    void Mission::start()
    8380    {
    84         std::fstream myfile;
    85 
    8681        Gametype::start();
    8782        this->setTeams();
    88         //just for testing
    89         //this->missionAccomplished_=true;
    9083        this->gtinfo_->sendAnnounceMessage("Your mission has started!");
    9184    }
     
    9386    void Mission::end()
    9487    {
    95 
    9688        if (this->missionAccomplished_ && !this->gtinfo_->hasEnded())
    9789        {
     
    10092            LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
    10193        }
    102 
    10394        else if (!this->gtinfo_->hasEnded())
    10495            this->gtinfo_->sendAnnounceMessage("Mission failed!");
     96
    10597        Gametype::end();
    10698    }
     
    122114            it->setMissionAccomplished(accomplished);
    123115            it->end();
    124 
    125116        }
    126117    }
     
    133124        }
    134125    }
    135 
    136126}
Note: See TracChangeset for help on using the changeset viewer.