X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.hh;h=5aeaeba0a7af1b8a5ea6e1c6f7f53fbee43c48e2;hp=b72e8c87e58910d6296218b2eff58696e8ac2ab1;hb=57b78ebe21b1b48acd337daa5a1cb8c383959cfa;hpb=58cedf00e6ebf6282938c019b8eb105e3fb05eaa

diff --git a/src/Character.hh b/src/Character.hh
index b72e8c8..5aeaeba 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -90,6 +90,11 @@ struct Character : public Mf::Entity
 		Mf::Scalar	mass;
 		Mf::Scalar	inverseMass;
 
+		void recalculate()
+		{
+			velocity = momentum * inverseMass;
+		}
+
 
 		void getDerivative(Derivative& derivative, Mf::Scalar t) const
 		{
@@ -99,11 +104,6 @@ struct Character : public Mf::Entity
 			derivative.force = force;
 		}
 
-		void recalculate()
-		{
-			velocity = momentum * inverseMass;
-		}
-
 		void applyDerivative(const Derivative& derivative, Mf::Scalar dt)
 		{
 			position += dt * derivative.velocity;
@@ -133,7 +133,7 @@ struct Character : public Mf::Entity
 	State			previous;
 	State			current;
 
-	stlplus::ntree<Mf::OctreeNode>::iterator treeNode;
+	Mf::OctreeNodeP treeNode;
 
 
 private:
@@ -164,7 +164,8 @@ public:
 };
 
 
-inline Character::State operator*(Mf::Scalar scalar, const Character::State& state)
+inline Character::State operator*(Mf::Scalar scalar,
+		const Character::State& state)
 {
 	Character::State newState = state;
 	newState.position *= scalar;