X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FCharacter.hh;h=82804babf16b32b37ae4db339229398ef3a8983b;hb=81ff940d1bea07447f8218ab9a764fbf393431e8;hp=28e588b627da8ccc0b45b49dc80cbac1b37fc258;hpb=2fdb5f5824826a6c54f5afde8c62eafd24c1a152;p=chaz%2Fyoink

diff --git a/src/Character.hh b/src/Character.hh
index 28e588b..82804ba 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -34,12 +34,11 @@
 #include <Moof/Aabb.hh>
 #include <Moof/Entity.hh>
 #include <Moof/Math.hh>
-#include <Moof/Octree.hh>
 #include <Moof/RigidBody.hh>
 #include <Moof/Sphere.hh>
+#include <Moof/Texture.hh>
 
 #include "Animation.hh"
-#include "Tilemap.hh"
 
 
 
@@ -52,7 +51,7 @@ typedef boost::shared_ptr<Character> CharacterP;
  * includes the heroine herself and the bad guys.
  */
 
-class Character : public Mf::RigidBody2, public Mf::OctreeInsertable
+class Character : public Mf::RigidBody2
 {
 public:
 
@@ -62,20 +61,14 @@ public:
 	virtual void update(Mf::Scalar t, Mf::Scalar dt);
 	virtual void draw(Mf::Scalar alpha) const;
 
-	void setZCoord(Mf::Scalar z);
-
 	void addImpulse(Mf::Vector2 impulse);
 	void addForce(Mf::Vector2 force);
 	void setPosition(Mf::Vector2 position);
 
-	virtual int getOctant(const Mf::Aabb& aabb) const;
+	//virtual int getOctant(const Mf::Aabb<3>& aabb) const;
 
-	Tilemap		tilemap;
+	Mf::Texture	tilemap;
 	Animation	animation;
-
-private:
-
-	mutable Mf::Scalar mZCoord;
 };