preliminary AM_SILENT_RULES support

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 5dfde01922860cbbbe6759f00eacc5a13b1f2bee..21734228b3ab005698cba8f5e20b059e8d7c38d0 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -43,7 +43,7 @@
 
 
 
-struct Character;
+class Character;
 typedef boost::shared_ptr<Character> CharacterP;
 
 
@@ -62,14 +62,20 @@ public:
        virtual void update(Mf::Scalar t, Mf::Scalar dt);
        virtual void draw(Mf::Scalar alpha) const;
 
-       virtual int getOctant(const Mf::Aabb& aabb) 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<3>& aabb) const;
 
        Tilemap         tilemap;
        Animation       animation;
 
 private:
 
-       static const Mf::Scalar z = 96.0;
+       mutable Mf::Scalar mZCoord;
 };