Changeset 2850 for code/branches/gui/src/core/GameState.h

Timestamp:

Mar 25, 2009, 11:53:04 PM (16 years ago)

Author:

rgrieder

Message:

• Started working on cleaning up the GameState mess
• Cleaned out GUIManager
• Renamed GSGUI to GSMainMenu
• "—state blah" has been changed to —server, —client, —standalone, —dedicated
• —console starts the game in the console (no level loading there yet, but "loadMenu")
• adjusted run scripts

File:

• code/branches/gui/src/core/GameState.h (modified) (2 diffs)

code/branches/gui/src/core/GameState.h

@@ -74 +74 @@
             unsigned updating     : 1;
             unsigned suspended    : 1;
+            unsigned topState     : 1;
         };
 
@@ -81 +82 @@
 
         const std::string& getName() const { return name_; }
-        const State getActivity() const    { return this->activity_; }
+        State getActivity() const    { return this->activity_; }
         GameState* getParent() const       { return this->parent_; }