big batch of progress

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 2f175ad65d3b7c90aeafaa03a7f6f6de3ba9c5b6..c9cf11a0542635798f2eeba1b18ea92e6058a680 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -29,13 +29,17 @@
 #ifndef _CHARACTER_HH_
 #define _CHARACTER_HH_
 
+#include "resource.hh"
+#include "drawable.hh"
+#include "animation.hh"
+#include "tilemap.hh"
+
+
 /**
- * @file Character.hh
  * Parent class of animate objects with "personalities."
  */
 
-
-class Character : public dc::resource, public dc::drawable
+class Character : public dc::drawable
 {
 public:
        struct exception : public std::runtime_error
@@ -45,13 +49,20 @@ public:
        };
 
        Character(const std::string& name);
+       ~Character();
 
        void draw(dc::scalar alpha);
 
-       dc::tilemap* texture;
-       dc::animation* anim;
+       dc::tilemap& getTilemap();
+       dc::animation& getAnimation();
+
+private:
+       dc::tilemap texture;
+       dc::animation anim;
 };
 
 
 #endif // _CHARACTER_HH_
 
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+