starting to move to a generic state structure

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 087bf494c819743eafc099fcca9f7c9635fc300a..090e7cb97a1d308e124735f01190f21751e785e0 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -50,6 +50,7 @@ typedef boost::shared_ptr<Character> CharacterP;
 
 struct Character : public Mf::Entity
 {
+       /*
        struct Derivative
        {
                Mf::Vector2 velocity;
@@ -134,9 +135,10 @@ struct Character : public Mf::Entity
                        return newState;
                }
        };
+*/
 
-       State                   previous;
-       State                   current;
+       Mf::State2              previous;
+       Mf::State2              current;
 
 
 private: