X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.hh;h=d1ec2c313713314bf0c3857002e33387c6a85680;hp=090e7cb97a1d308e124735f01190f21751e785e0;hb=23d8f7a5fbd1eca7f46f2342c20ac5e28ae0128a;hpb=fa9438c66ae0154e6d9ad196e0fb39649d359da4

diff --git a/src/Character.hh b/src/Character.hh
index 090e7cb..d1ec2c3 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -31,12 +31,14 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Animation.hh>
 #include <Moof/Entity.hh>
 #include <Moof/Event.hh>
 #include <Moof/Math.hh>
 #include <Moof/RK4.hh>
-#include <Moof/Tilemap.hh>
+
+#include "Animation.hh"
+#include "Tilemap.hh"
+
 
 
 struct Character;
@@ -145,9 +147,6 @@ private:
 
 	static const Mf::Scalar z = 96.0;
 
-	Mf::Tilemap		tilemap_;
-	Mf::Animation	animation_;
-
 protected:
 
 	Mf::Vector2 userForce;
@@ -160,8 +159,9 @@ public:
 	virtual void update(Mf::Scalar t, Mf::Scalar dt);
 	virtual void draw(Mf::Scalar alpha) const;
 
-	Mf::Tilemap& getTilemap();
-	Mf::Animation& getAnimation();
+
+	Tilemap		tilemap;
+	Animation	animation;
 };