minor cleanups

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 5aeaeba0a7af1b8a5ea6e1c6f7f53fbee43c48e2..96ac499001110bf1882d5f93e3c2634f4aa265b2 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -36,7 +36,7 @@
 #include <Moof/Event.hh>
 #include <Moof/Math.hh>
 #include <Moof/Octree.hh>
-#include <Moof/Physics.hh>
+#include <Moof/RK4.hh>
 #include <Moof/Tilemap.hh>
 
 
@@ -111,6 +111,9 @@ struct Character : public Mf::Entity
                        recalculate();
                }
 
+               // these two operator overloads all using the state in generic
+               // interpolator implementations
+
                State operator*(Mf::Scalar scalar) const
                {
                        State state = *this;
@@ -153,7 +156,7 @@ public:
        }
 
        Character(const std::string& name);
-       virtual ~Character();
+       inline virtual ~Character() {}
 
        void update(Mf::Scalar t, Mf::Scalar dt);
        void handleEvent(const Mf::Event& event);
@@ -164,15 +167,15 @@ public:
 };
 
 
-inline Character::State operator*(Mf::Scalar scalar,
-               const Character::State& state)
-{
-       Character::State newState = state;
-       newState.position *= scalar;
-       newState.momentum *= scalar;
-       newState.recalculate();
-       return newState;
-}
+//inline Character::State operator*(Mf::Scalar scalar,
+               //const Character::State& state)
+//{
+       //Character::State newState = state;
+       //newState.position *= scalar;
+       //newState.momentum *= scalar;
+       //newState.recalculate();
+       //return newState;
+//}
 
 
 #endif // _CHARACTER_HH_