extreme refactoring

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 2f175ad65d3b7c90aeafaa03a7f6f6de3ba9c5b6..b1965ce7dd129076ff82b3af3484ae3599157270 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -29,29 +29,41 @@
 #ifndef _CHARACTER_HH_
 #define _CHARACTER_HH_
 
+#include <Moof/Animation.hh>
+#include <Moof/Drawable.hh>
+#include <Moof/Resource.hh>
+#include <Moof/Tilemap.hh>
+
+
 /**
- * @file Character.hh
  * Parent class of animate objects with "personalities."
  */
 
-
-class Character : public dc::resource, public dc::drawable
+class Character : public Mf::Drawable
 {
 public:
-       struct exception : public std::runtime_error
+       Character(const std::string& name);
+       ~Character();
+
+       void draw(Mf::Scalar alpha);
+
+       Mf::Tilemap& getTilemap();
+       Mf::Animation& getAnimation();
+
+
+       struct Exception : public std::runtime_error
        {
-               explicit exception(const std::string& what_arg) :
+               explicit Exception(const std::string& what_arg) :
                        std::runtime_error(what_arg) {}
        };
 
-       Character(const std::string& name);
-
-       void draw(dc::scalar alpha);
-
-       dc::tilemap* texture;
-       dc::animation* anim;
+private:
+       Mf::Tilemap tilemap;
+       Mf::Animation animation;
 };
 
 
 #endif // _CHARACTER_HH_
 
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+