Changeset 8029 for code/branches/usability/src/orxonox/gamestates/GSRoot.cc
- Timestamp:
- Mar 6, 2011, 1:38:49 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/usability/src/orxonox/gamestates/GSRoot.cc
r7935 r8029 38 38 #include "tools/interfaces/Tickable.h" 39 39 40 #include "GSLevel.h" 41 40 42 namespace orxonox 41 43 { … … 45 47 static const std::string __CC_setPause_name = "setPause"; 46 48 static const std::string __CC_pause_name = "pause"; 49 50 /*static*/ bool GSRoot::startMainMenu_s = false; 47 51 48 52 SetConsoleCommand("printObjects", &GSRoot::printObjects).hide(); … … 98 102 void GSRoot::update(const Clock& time) 99 103 { 104 if(startMainMenu_s) 105 { 106 delayedStartMainMenu(); 107 startMainMenu_s = false; 108 } 109 100 110 for (ObjectList<Timer>::iterator it = ObjectList<Timer>::begin(); it; ) 101 111 { … … 175 185 callStaticNetworkFunction(&TimeFactorListener::setTimeFactor, CLIENTID_UNKNOWN, factor_new); 176 186 } 187 188 /*static*/ void GSRoot::delayedStartMainMenu(void) 189 { 190 if(!startMainMenu_s) 191 startMainMenu_s = true; 192 else 193 GSLevel::startMainMenu(); 194 } 195 177 196 }
Note: See TracChangeset
for help on using the changeset viewer.