Changeset 1689 for code/branches/gui/src/orxonox/Main.cc

Timestamp:

Aug 31, 2008, 6:07:57 PM (16 years ago)

Author:

rgrieder

Message:

• renamed:

GameState —> GameStateBase
GameStateTyped<T> —> GameState

• moved command line parsing from GSRoot to RootGameState.

File:

• code/branches/gui/src/orxonox/Main.cc (modified) (3 diffs)

code/branches/gui/src/orxonox/Main.cc

@@ -48 +48 @@
 #include "gamestates/GSClient.h"
 #include "gamestates/GSGUI.h"
-#include "gamestates/GSIO.h"
 #include "gamestates/GSIOConsole.h"
 
@@ -90 +89 @@
     SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
 
-
-    /*GameState* state1 = new GameState("state1");
-    GameState* state2 = new GameState("state2");
-    GameState* state3 = new GameState("state3");
-    GameState* state4 = new GameState("state4");
-    GameState* state5 = new GameState("state5");
-    GameState* state6 = new GameState("state6");
-
-    state1->addChild(state4);
-    state1->addChild(state6);
-    state2->addChild(state3);
-    state2->addChild(state5);
-    state6->addChild(state2);
-
-    state6->removeChild("state2");
-
-    state5->requestState("state3");
-    COUT(2) << std::endl;
-    state2->requestState("state2");
-    COUT(2) << std::endl;
-    state2->requestState("state1");
-    COUT(2) << std::endl;
-    state4->requestState("state3");
-    COUT(2) << std::endl;
-    state1->requestState("state4");
-    COUT(2) << std::endl;
-    state1->requestState("state2");
-    COUT(2) << std::endl;
-    state1->requestState("stat");
-    COUT(2) << std::endl;
-    state1->requestState("state5");
-    COUT(2) << std::endl;*/
-
-
     GSRoot root;
     GSGraphics graphics;
@@ -140 +105 @@
     root.addChild(&ioConsole);
 
-    root.feedCommandLine(argc, argv);
-    root.start();
+    root.start(argc, argv);
 
     return 0;