X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.hh;h=bb2d5e6dd69f9efeb920408401df4daa1ccab14a;hp=4140d17249e2b8d822a31c8e8893e09737ef78b4;hb=HEAD;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

diff --git a/src/Character.hh b/src/Character.hh
index 4140d17..bb2d5e6 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -1,13 +1,11 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, Charles McGarvey  [*****************************
 **]  All rights reserved.
 *
-* vi:ts=4 sw=4 tw=75
-*
 * Distributable under the terms and conditions of the 2-clause BSD license;
 * see the file COPYING for a complete text of the license.
 *
-**************************************************************************/
+*****************************************************************************/
 
 #ifndef _CHARACTER_HH_
 #define _CHARACTER_HH_
@@ -16,12 +14,12 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Aabb.hh>
-#include <Moof/Entity.hh>
-#include <Moof/Math.hh>
-#include <Moof/RigidBody.hh>
-#include <Moof/Sphere.hh>
-#include <Moof/Texture.hh>
+#include <moof/aabb.hh>
+#include <moof/entity.hh>
+#include <moof/math.hh>
+#include <moof/rigid_body.hh>
+#include <moof/sphere.hh>
+#include <moof/sprite.hh>
 
 #include "Animation.hh"
 
@@ -29,29 +27,27 @@
 class Character;
 typedef boost::shared_ptr<Character> CharacterP;
 
-
 /**
  * Parent class of animate objects with "personalities."  This basically
  * includes the heroine herself and the bad guys.
  */
-
-class Character : public Mf::RigidBody2
+class Character : public moof::rigid_body2
 {
 public:
 
 	Character(const std::string& name);
 	virtual ~Character() {}
 
-	virtual void update(Mf::Scalar t, Mf::Scalar dt);
-	virtual void draw(Mf::Scalar alpha) const;
+	virtual void update(moof::scalar t, moof::scalar dt);
+	virtual void draw(moof::scalar alpha) const;
 
-	void addImpulse(Mf::Vector2 impulse);
-	void addForce(Mf::Vector2 force);
-	void setPosition(Mf::Vector2 position);
+	void addImpulse(moof::vector2 impulse);
+	void addForce(moof::vector2 force);
+	void setPosition(moof::vector2 position);
 
-	//virtual int getOctant(const Mf::Aabb<3>& aabb) const;
+	//virtual int getOctant(const moof::Aabb<3>& aabb) const;
 
-	Mf::Texture	tilemap;
+	moof::sprite	tilemap;
 	Animation	animation;
 };