Changeset 3358 for code/branches/resource/src/core

Timestamp:

Jul 27, 2009, 2:42:37 PM (16 years ago)

Author:

rgrieder

Message:

Moved startup argument parsing (console, dedicated, server, client and standalone) from GSRoot.cc to Main.cc.
This allows to finally prevent GameState request while loading/unloading them (changed the code in Game.cc to enforce this).

File:

• code/branches/resource/src/core/Game.cc (modified) (1 diff)

code/branches/resource/src/core/Game.cc

@@ -390 +390 @@
         }
 
-        //if (this->bChangingState_)
-        //{
-        //    COUT(2) << "Warning: Requesting GameStates while loading/unloading a GameState is illegal! Ignoring." << std::endl;
-        //    return;
-        //}
+        if (this->bChangingState_)
+        {
+            COUT(2) << "Warning: Requesting GameStates while loading/unloading a GameState is illegal! Ignoring." << std::endl;
+            return;
+        }
 
         shared_ptr<GameStateTreeNode> lastRequestedNode;