Changeset 1689 for code/branches/gui/src/core/RootGameState.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/core/RootGameState.cc (modified) (6 diffs)

code/branches/gui/src/core/RootGameState.cc

@@ -39 +39 @@
 
     RootGameState::RootGameState(const std::string& name)
-        : GameStateTyped<GameState>(name)
+        : GameState<GameStateBase>(name)
         , stateRequest_("")
     {
@@ -53 +53 @@
         the method can assume certain things to be granted (like 'this' is always active).
     */
-    void RootGameState::makeTransition(GameState* source, GameState* destination)
+    void RootGameState::makeTransition(GameStateBase* source, GameStateBase* destination)
     {
         if (source != 0)
@@ -68 +68 @@
 
         // Check for 'destination' in the children map first
-        std::map<GameState*, GameState*>::const_iterator it
+        std::map<GameStateBase*, GameStateBase*>::const_iterator it
             = this->grandchildrenToChildren_.find(destination);
         if (it != this->grandchildrenToChildren_.end())
         {
-            OrxAssert(dynamic_cast<GameState*>(it->second) != 0,
+            OrxAssert(dynamic_cast<GameStateBase*>(it->second) != 0,
                 "There was a mix with RootGameState and GameState, could not cast.");
-            GameState* child = static_cast<GameState*>(it->second);
+            GameStateBase* child = static_cast<GameStateBase*>(it->second);
             // child state. Don't use 'state', might be a grandchild!
             this->activeChild_ = child;
@@ -88 +88 @@
     void RootGameState::gotoState(const std::string& name)
     {
-        GameState* request = getState(name);
+        GameStateBase* request = getState(name);
         if (request)
         {
-            GameState* current = getCurrentState();
+            GameStateBase* current = getCurrentState();
             if (current)
             {
@@ -127 +127 @@
         State to start with (usually main menu or specified by command line)
     */
-    void RootGameState::start()
+    void RootGameState::start(int argc, char** argv)
     {
+        parseCommandLine(argc, argv);
+
         this->activate();
 
@@ -149 +151 @@
         this->deactivate();
     }
+
+    void RootGameState::parseCommandLine(int argc, char** argv)
+    {
+        std::vector<std::string> args;
+        for (int i = 1; i < argc; ++i)
+            args.push_back(argv[i]);
+
+        try
+        {
+            orxonox::CommandLine::parse(args);
+        }
+        catch (orxonox::ArgumentException& ex)
+        {
+            COUT(1) << ex.what() << std::endl;
+            COUT(0) << "Usage:" << std::endl << "orxonox " << CommandLine::getUsageInformation() << std::endl;
+        }
+    }
 }