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

Timestamp:

Mar 21, 2009, 5:56:10 PM (16 years ago)

Author:

rgrieder

Message:

various small changes:

• Fixed a bug in the GameStates concerning return type of virtual functions
• Found some more C-style casts

File:

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

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

@@ -109 +109 @@
         void tickChild(const Clock& time) { if (this->getActiveChild()) this->getActiveChild()->tick(time); }
 
-        virtual GameStateBase* getParent() const = 0;
+        virtual GameStateBase* getParentAsBase() const = 0;
         virtual void setParent(GameStateBase* state) = 0;
 
@@ -146 +146 @@
         virtual ~GameState() { }
 
+        GameStateBase* getParentAsBase() const
+            { return parent_; }
+
         ParentType* getParent() const
             { return parent_; }