Changeset 8692
- Timestamp:
- May 31, 2011, 5:34:18 PM (13 years ago)
- Location:
- code/branches/presentation/src/orxonox/gamestates
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation/src/orxonox/gamestates/GSRoot.cc
r8327 r8692 45 45 46 46 static const std::string __CC_setTimeFactor_name = "setTimeFactor"; 47 static const std::string __CC_getTimeFactor_name = "getTimeFactor"; 47 48 static const std::string __CC_setPause_name = "setPause"; 48 49 static const std::string __CC_pause_name = "pause"; … … 52 53 SetConsoleCommand("printObjects", &GSRoot::printObjects).hide(); 53 54 SetConsoleCommand(__CC_setTimeFactor_name, &GSRoot::setTimeFactor).accessLevel(AccessLevel::Master).defaultValues(1.0); 55 SetConsoleCommand(__CC_getTimeFactor_name, &GSRoot::getTimeFactor).accessLevel(AccessLevel::Master); 54 56 SetConsoleCommand(__CC_setPause_name, &GSRoot::setPause ).accessLevel(AccessLevel::Master).hide(); 55 57 SetConsoleCommand(__CC_pause_name, &GSRoot::pause ).accessLevel(AccessLevel::Master); … … 89 91 90 92 ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(this); 93 ModifyConsoleCommand(__CC_getTimeFactor_name).setObject(this); 91 94 ModifyConsoleCommand(__CC_setPause_name).setObject(this); 92 95 ModifyConsoleCommand(__CC_pause_name).setObject(this); … … 96 99 { 97 100 ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(0); 101 ModifyConsoleCommand(__CC_getTimeFactor_name).setObject(0); 98 102 ModifyConsoleCommand(__CC_setPause_name).setObject(0); 99 103 ModifyConsoleCommand(__CC_pause_name).setObject(0); … … 151 155 this->timeFactorPauseBackup_ = factor; 152 156 } 157 } 158 159 float GSRoot::getTimeFactor() 160 { 161 return TimeFactorListener::getTimeFactor(); 153 162 } 154 163 -
code/branches/presentation/src/orxonox/gamestates/GSRoot.h
r8079 r8692 54 54 void pause(); 55 55 56 float getTimeFactor(); 57 56 58 static void delayedStartMainMenu(void); 57 59
Note: See TracChangeset
for help on using the changeset viewer.