--- a/src/proto2/Physics.hh	Mon Dec 01 23:32:17 2008 +0000
+++ b/src/proto2/Physics.hh	Mon Dec 01 23:39:37 2008 +0000
@@ -150,9 +150,6 @@
     // TODO: Should these operations be moved to PhysicsWorld?
     // Force queue that is emptied on every tick
     std::queue<Force> forceq;
-    // Helper variables for integration
-    Vector posAfterTick;
-    Vector velAfterTick;
 
     /**
      * Handle player movement and apply forces.
@@ -166,7 +163,7 @@
      * @param force Force to integrate
      * @param dt Time intervall
      */
-    void integrate(Force force, TimeMS dt);
+    void integrate(Force force, TimeMS dt, Vector &posAfterTick, Vector &velAfterTick);
 
     /**
      * Evaluate the value of the derivative at given time
@@ -175,7 +172,7 @@
      * @param dt Time
      * @param d Previous derivative
      */
-    Derivative evaluate(Force force, TimeMS dt, Derivative &d);
+    Derivative evaluate(Force force, TimeMS dt, Derivative &d, const Vector &posAfterTick, const Vector &velAfterTick);
 
     /**
      * Return object acceleration with given force.