scene drawing correctly implemented; new classes

[chaz/yoink] / src / Character.cc

diff --git a/src/Character.cc b/src/Character.cc
index 64866c5eba907b172d3bb1847f65573ff22c0c41..f508682944d3a5db96ca210d9a710cd7ef2065d8 100644 (file)
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -30,8 +30,8 @@
 
        
 Character::Character(const std::string& name) :
-       texture(name),
-       anim(name) {}
+       tilemap(name),
+       animation(name) {}
 
 Character::~Character()
 {
@@ -40,16 +40,16 @@ Character::~Character()
 }
 
 
-void Character::draw(dc::scalar alpha) {}
+void Character::draw(Mf::Scalar alpha) const {}
 
-dc::tilemap& Character::getTilemap()
+Mf::Tilemap& Character::getTilemap()
 {
-       return texture;
+       return tilemap;
 }
 
-dc::animation& Character::getAnimation()
+Mf::Animation& Character::getAnimation()
 {
-       return anim;
+       return animation;
 }