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

Timestamp:

Mar 21, 2009, 10:17:59 PM (15 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.h (modified) (2 diffs)

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

@@ -35 +35 @@
 namespace orxonox
 {
-    class _CoreExport RootGameState : public GameState<GameStateBase>
+    class _CoreExport RootGameState : public GameState
     {
         // Hack!
@@ -47 +47 @@
 
     private:
-        void makeTransition(GameStateBase* source, GameStateBase* destination);
+        void makeTransition(GameState* source, GameState* destination);
         void gotoState(const std::string& name);