Changeset 2850 for code/branches/gui/src/core

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

Location:

code/branches/gui/src/core

Files:

• Game.cc (modified) (6 diffs)
• Game.h (modified) (1 diff)
• GameState.cc (modified) (1 diff)
• GameState.h (modified) (2 diffs)

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

@@ -40 +40 @@
 #include "util/Debug.h"
 #include "util/Exception.h"
+#include "util/SubString.h"
 #include "Clock.h"
 #include "CommandLine.h"
@@ -247 +248 @@
         // Check parent and all its grand parents
         GameStateTreeNode* currentNode = lastRequestedNode;
-        while (requestedNode == NULL && currentNode->parent_ != NULL)
+        while (requestedNode == NULL && currentNode != NULL)
         {
             if (currentNode->state_ == state)
@@ -260 +261 @@
     }
 
+    void Game::requestStates(const std::string& names)
+    {
+        SubString tokens(names, ",;", " ");
+        for (unsigned int i = 0; i < tokens.size(); ++i)
+            this->requestState(tokens[i]);
+    }
+
     void Game::popState()
     {
@@ -270 +278 @@
     GameState* Game::getState(const std::string& name)
     {
-        std::map<std::string, GameState*>::const_iterator it = allStates_s.find(name);
+        std::map<std::string, GameState*>::const_iterator it = allStates_s.find(getLowercase(name));
         if (it != allStates_s.end())
             return it->second;
@@ -356 +364 @@
     void Game::loadState(GameState* state)
     {
+        if (!this->activeStates_.empty())
+            this->activeStates_.back()->activity_.topState = false;
         state->activate();
+        state->activity_.topState = true;
         this->activeStates_.push_back(state);
     }
@@ -362 +373 @@
     void Game::unloadState(orxonox::GameState* state)
     {
+        state->activity_.topState = false;
         state->deactivate();
         this->activeStates_.pop_back();
+        if (!this->activeStates_.empty())
+            this->activeStates_.back()->activity_.topState = true;
     }
 
     /*static*/ bool Game::addGameState(GameState* state)
     {
-        std::map<std::string, GameState*>::const_iterator it = allStates_s.find(state->getName());
+        std::map<std::string, GameState*>::const_iterator it = allStates_s.find(getLowercase(state->getName()));
         if (it == allStates_s.end())
-            allStates_s[state->getName()] = state;
+            allStates_s[getLowercase(state->getName())] = state;
         else
             ThrowException(GameState, "Cannot add two GameStates with the same name to 'Game'.");

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

@@ -66 +66 @@
 
         void requestState(const std::string& name);
+        void requestStates(const std::string& names);
         void popState();
 

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

@@ -49 +49 @@
         , parent_(0)
     {
-        State temp = {false, false, false, false, false};
-        this->activity_ = temp;
+        this->activity_.activating   = false;
+        this->activity_.active       = false;
+        this->activity_.deactivating = false;
+        this->activity_.suspended    = false;
+        this->activity_.topState     = false;
+        this->activity_.updating     = false;
     }
 

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_; }