Changeset 10254 for code/branches/storymodeHS14
- Timestamp:
- Feb 3, 2015, 11:43:42 PM (10 years ago)
- Location:
- code/branches/storymodeHS14
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua
r10250 r10254 19 19 P.createFilterTab("Tests", "test") 20 20 P.createFilterTab("Show All", nil) 21 22 21 23 22 -- update description and screenshot boxes 24 23 P.SingleplayerSelectionChanged() 25 24 26 --buttons are arranged in a 1x4matrix25 --buttons are arranged in a 2x3 matrix 27 26 P:setButton(1, 1, { 28 27 ["button"] = winMgr:getWindow("orxonox/SingleplayerStartButton"), … … 39 38 ["callback"] = P.SingleplayerBackButton_clicked 40 39 }) 41 P:setButton(1, 4,{ 40 41 P:setButton(2, 2,{ 42 42 ["button"] = winMgr:getWindow("orxonox/CampaignButton"), 43 43 ["callback"] = P.CampaignButton_clicked -
code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc
r10253 r10254 29 29 #include "Mission.h" 30 30 31 #include <boost/filesystem.hpp>32 33 31 #include "items/Engine.h" 34 32 #include "controllers/ArtificialController.h" … … 36 34 #include "core/CoreIncludes.h" 37 35 #include "core/command/ConsoleCommand.h" 38 #include "core/config/ConfigValueIncludes.h"39 36 #include "infos/PlayerInfo.h" 40 37 #include "network/Host.h" … … 82 79 void Mission::start() 83 80 { 84 std::fstream myfile;85 86 81 Gametype::start(); 87 82 this->setTeams(); 88 //just for testing89 //this->missionAccomplished_=true;90 83 this->gtinfo_->sendAnnounceMessage("Your mission has started!"); 91 84 } … … 93 86 void Mission::end() 94 87 { 95 96 88 if (this->missionAccomplished_ && !this->gtinfo_->hasEnded()) 97 89 { … … 100 92 LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename()); 101 93 } 102 103 94 else if (!this->gtinfo_->hasEnded()) 104 95 this->gtinfo_->sendAnnounceMessage("Mission failed!"); 96 105 97 Gametype::end(); 106 98 } … … 122 114 it->setMissionAccomplished(accomplished); 123 115 it->end(); 124 125 116 } 126 117 } … … 133 124 } 134 125 } 135 136 126 }
Note: See TracChangeset
for help on using the changeset viewer.