Changeset 5782 for sandbox/src/orxonox/Main.cc

Timestamp:

Sep 24, 2009, 11:32:39 AM (15 years ago)

Author:

rgrieder

Message:

Applied changes to the real sandbox this time.

File:

• sandbox/src/orxonox/Main.cc (modified) (2 diffs)

sandbox/src/orxonox/Main.cc

@@ -41 +41 @@
 #include "core/Game.h"
 #include "core/LuaState.h"
-#include "ToluaBindOrxonox.h"
 #include "Main.h"
-
-SetCommandLineSwitch(console).information("Start in console mode (text IO only)");
-// Shortcuts for easy direct loading
-SetCommandLineSwitch(server).information("Start in server mode");
-SetCommandLineSwitch(client).information("Start in client mode");
-SetCommandLineSwitch(dedicated).information("Start in dedicated server mode");
-SetCommandLineSwitch(standalone).information("Start in standalone mode");
-
-DeclareToluaInterface(Orxonox);
 
 namespace orxonox
@@ -65 +55 @@
         game->setStateHierarchy(
         "root"
-        " graphics"
-        "  mainMenu"
-        "  standalone"
-        "   level"
-        "  server"
-        "   level"
-        "  client"
-        "   level"
-        " dedicated"
-        "  level"
-        " ioConsole"
         );
 
         game->requestState("root");
-
-        // Some development hacks (not really, but in the future, this calls won't make sense anymore)
-        if (CommandLine::getValue("standalone").getBool())
-            Game::getInstance().requestStates("graphics, standalone, level");
-        else if (CommandLine::getValue("server").getBool())
-            Game::getInstance().requestStates("graphics, server, level");
-        else if (CommandLine::getValue("client").getBool())
-            Game::getInstance().requestStates("graphics, client, level");
-        else if (CommandLine::getValue("dedicated").getBool())
-            Game::getInstance().requestStates("dedicated, level");
-        else if (CommandLine::getValue("console").getBool())
-            Game::getInstance().requestStates("ioConsole");
-        else
-            Game::getInstance().requestStates("graphics, mainMenu");
 
         game->run();