Changeset 2817 for code/branches/gui/src/core/RootGameState.cc

Timestamp:

Mar 21, 2009, 10:17:59 PM (16 years ago)

Author:

rgrieder

Message:

Removed GameState template and renamed GameStateBase to GameState.
Moved statistics stuff (fps and tick time) to Game and removed the remaining hacks in GSGraphics and GSRoot.

File:

• code/branches/gui/src/core/RootGameState.cc (modified) (4 diffs)

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

@@ -36 +36 @@
 {
     RootGameState::RootGameState(const std::string& name)
-        : GameState<GameStateBase>(name)
+        : GameState(name)
         , stateRequest_("")
     {
@@ -50 +50 @@
         the method can assume certain things to be granted (like 'this' is always active).
     */
-    void RootGameState::makeTransition(GameStateBase* source, GameStateBase* destination)
+    void RootGameState::makeTransition(GameState* source, GameState* destination)
     {
         if (source != 0)
@@ -65 +65 @@
 
         // Check for 'destination' in the children map first
-        std::map<GameStateBase*, GameStateBase*>::const_iterator it
+        std::map<GameState*, GameState*>::const_iterator it
             = this->grandchildrenToChildren_.find(destination);
         if (it != this->grandchildrenToChildren_.end())
         {
-            OrxAssert(static_cast<GameStateBase*>(it->second) != 0,
+            OrxAssert(static_cast<GameState*>(it->second) != 0,
                 "There was a mix with RootGameState and GameState, could not cast.");
-            GameStateBase* child = static_cast<GameStateBase*>(it->second);
+            GameState* child = static_cast<GameState*>(it->second);
             // child state. Don't use 'state', might be a grandchild!
             this->activeChild_ = child;
@@ -85 +85 @@
     void RootGameState::gotoState(const std::string& name)
     {
-        GameStateBase* request = getState(name);
+        GameState* request = getState(name);
         if (request)
         {
-            GameStateBase* current = getCurrentState();
+            GameState* current = getCurrentState();
             if (current)
             {