Changeset 3280 for code/trunk/src/orxonox/gamestates/GSRoot.cc
- Timestamp:
- Jul 12, 2009, 11:58:01 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 (added) merged: 3235-3237,3245-3250,3253-3254,3260-3261,3265,3270
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gamestates/GSRoot.cc
r3196 r3280 37 37 #include "interfaces/TimeFactorListener.h" 38 38 #include "interfaces/Tickable.h" 39 #include "LevelManager.h" 39 40 40 41 namespace orxonox 41 42 { 42 AddGameState(GSRoot, "root", false);43 SetCommandLineSwitch(console) ;43 DeclareGameState(GSRoot, "root", true, false); 44 SetCommandLineSwitch(console).information("Start in console mode (text IO only)"); 44 45 // Shortcuts for easy direct loading 45 SetCommandLineSwitch(server) ;46 SetCommandLineSwitch(client) ;47 SetCommandLineSwitch(dedicated) ;48 SetCommandLineSwitch(standalone) ;49 50 GSRoot::GSRoot(const std::string& name, bool countTickTime)51 : GameState( name, countTickTime)46 SetCommandLineSwitch(server).information("Start in server mode"); 47 SetCommandLineSwitch(client).information("Start in client mode"); 48 SetCommandLineSwitch(dedicated).information("Start in dedicated server mode"); 49 SetCommandLineSwitch(standalone).information("Start in standalone mode"); 50 51 GSRoot::GSRoot(const GameStateConstrParams& params) 52 : GameState(params) 52 53 , timeFactor_(1.0f) 53 54 , bPaused_(false) … … 83 84 } 84 85 86 // create the global LevelManager 87 this->levelManager_ = new LevelManager(); 88 85 89 // Load level directly? 86 90 bool loadLevel = false; … … 129 133 } 130 134 */ 135 136 delete this->levelManager_; 131 137 } 132 138
Note: See TracChangeset
for help on using the changeset viewer.