Changeset 9977 for code/trunk/src/orxonox/gametypes/Gametype.cc
- Timestamp:
- Jan 4, 2014, 9:42:47 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/gametypes/Gametype.cc
r9972 r9977 35 35 #include "core/GameMode.h" 36 36 #include "core/command/ConsoleCommand.h" 37 //#include "gamestates/GSLevel.h"37 #include "gamestates/GSLevel.h" 38 38 39 39 #include "infos/PlayerInfo.h" … … 62 62 this->bAutoStart_ = false; 63 63 this->bForceSpawn_ = false; 64 //this->bAutoEnd_ = true;64 this->bAutoEnd_ = true; 65 65 this->numberOfBots_ = 0; 66 66 … … 106 106 SetConfigValue(bAutoStart_, false); 107 107 SetConfigValue(bForceSpawn_, false); 108 //SetConfigValue(bAutoEnd_, true);108 SetConfigValue(bAutoEnd_, true); 109 109 SetConfigValue(numberOfBots_, 0); 110 110 SetConfigValue(scoreboardTemplate_, "defaultScoreboard"); … … 154 154 { 155 155 this->gtinfo_->end(); 156 //if (this->bAutoEnd_) 157 // this->showMenuTimer_.setTimer(2.5f, true, createExecutor(createFunctor(&Gametype::showMenu, this))); 156 if (this->bAutoEnd_) 157 { 158 GSLevel::startMainMenu(); 159 //this->showMenuTimer_.setTimer(2.5f, true, createExecutor(createFunctor(&Gametype::showMenu, this))); 160 } 158 161 159 162 for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it) … … 519 522 } 520 523 521 //void Gametype::showMenu()522 //{523 //GSLevel::startMainMenu();524 //}524 void Gametype::showMenu() 525 { 526 GSLevel::startMainMenu(); 527 } 525 528 }
Note: See TracChangeset
for help on using the changeset viewer.