preliminary cleanup of character class

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index e39e7ff93bb9ad3de3e66ef6e1ed163e6a97df11..19559f38b0f54be1643f31fc29f2949323be977b 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -29,30 +29,43 @@
 #ifndef _CHARACTER_HH_
 #define _CHARACTER_HH_
 
-#include <Moof/Animation.hh>
-#include <Moof/Drawable.hh>
-#include <Moof/Resource.hh>
-#include <Moof/Tilemap.hh>
+#include <boost/shared_ptr.hpp>
+
+#include <Moof/Entity.hh>
+#include <Moof/Math.hh>
+#include <Moof/RK4.hh>
+
+#include "Animation.hh"
+#include "Tilemap.hh"
+
+
+
+struct Character;
+typedef boost::shared_ptr<Character> CharacterP;
 
 
 /**
- * Parent class of animate objects with "personalities."
+ * Parent class of animate objects with "personalities."  This basically
+ * includes the heroine herself and the bad guys.
  */
 
-class Character : public Mf::Drawable
+struct Character : public Mf::Entity
 {
+protected:
+
+       Mf::Vector2 userForce;
+
 public:
+
        Character(const std::string& name);
-       ~Character();
+       virtual ~Character() {}
 
-       void draw(Mf::Scalar alpha) const;
+       virtual void update(Mf::Scalar t, Mf::Scalar dt);
+       virtual void draw(Mf::Scalar alpha) const;
 
-       Mf::Tilemap& getTilemap();
-       Mf::Animation& getAnimation();
 
-private:
-       Mf::Tilemap tilemap;
-       Mf::Animation animation;
+       Tilemap         tilemap;
+       Animation       animation;
 };