Changeset 9969 for code/trunk/src/orxonox/gametypes/Gametype.cc
- Timestamp:
- Jan 4, 2014, 2:14:06 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/gametypes/Gametype.cc
r9939 r9969 35 35 #include "core/GameMode.h" 36 36 #include "core/command/ConsoleCommand.h" 37 #include "gamestates/GSLevel.h" 37 38 38 39 #include "infos/PlayerInfo.h" … … 61 62 this->bAutoStart_ = false; 62 63 this->bForceSpawn_ = false; 64 this->bAutoEnd_ = true; 63 65 this->numberOfBots_ = 0; 64 66 … … 104 106 SetConfigValue(bAutoStart_, false); 105 107 SetConfigValue(bForceSpawn_, false); 108 SetConfigValue(bAutoEnd_, true); 106 109 SetConfigValue(numberOfBots_, 0); 107 110 SetConfigValue(scoreboardTemplate_, "defaultScoreboard"); … … 144 147 { 145 148 this->addBots(this->numberOfBots_); 146 147 149 this->gtinfo_->start(); 148 149 150 this->spawnPlayersIfRequested(); 150 151 } … … 153 154 { 154 155 this->gtinfo_->end(); 156 if (this->bAutoEnd_) 157 this->showMenuTimer_.setTimer(2.5f, true, createExecutor(createFunctor(&Gametype::showMenu, this))); 155 158 156 159 for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it) … … 515 518 this->time_ = t; 516 519 } 520 521 void Gametype::showMenu() 522 { 523 GSLevel::startMainMenu(); 524 } 517 525 }
Note: See TracChangeset
for help on using the changeset viewer.