extreme refactoring

[chaz/yoink] / src / Character.hh

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