converted tilemap scripts to lua

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 087bf494c819743eafc099fcca9f7c9635fc300a..d1ec2c313713314bf0c3857002e33387c6a85680 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -31,12 +31,14 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Animation.hh>
 #include <Moof/Entity.hh>
 #include <Moof/Event.hh>
 #include <Moof/Math.hh>
 #include <Moof/RK4.hh>
-#include <Moof/Tilemap.hh>
+
+#include "Animation.hh"
+#include "Tilemap.hh"
+
 
 
 struct Character;
@@ -50,6 +52,7 @@ typedef boost::shared_ptr<Character> CharacterP;
 
 struct Character : public Mf::Entity
 {
+       /*
        struct Derivative
        {
                Mf::Vector2 velocity;
@@ -134,18 +137,16 @@ struct Character : public Mf::Entity
                        return newState;
                }
        };
+*/
 
-       State                   previous;
-       State                   current;
+       Mf::State2              previous;
+       Mf::State2              current;
 
 
 private:
 
        static const Mf::Scalar z = 96.0;
 
-       Mf::Tilemap             tilemap_;
-       Mf::Animation   animation_;
-
 protected:
 
        Mf::Vector2 userForce;
@@ -158,8 +159,9 @@ public:
        virtual void update(Mf::Scalar t, Mf::Scalar dt);
        virtual void draw(Mf::Scalar alpha) const;
 
-       Mf::Tilemap& getTilemap();
-       Mf::Animation& getAnimation();
+
+       Tilemap         tilemap;
+       Animation       animation;
 };