X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fphysic.cpp;h=2a3f95cf733ac66f7acb3673865dc481c616c914;hb=cde3a617070bee8af4ddcf58122cf6a65b97d874;hp=55b491ac6c1070f174b4ce249b9f47730a1a8c58;hpb=308f11e38981077626fe0ea9887094f3c28b02f9;p=supertux.git

diff --git a/src/physic.cpp b/src/physic.cpp
index 55b491ac6..2a3f95cf7 100644
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -17,15 +17,9 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
+#include <config.h>
 
-#include <cstdio>
-
-#include "scene.h"
-#include "defines.h"
-#include "physic.h"
-#include "timer.h"
-#include "sector.h"
-#include "level.h"
+#include "physic.hpp"
 
 Physic::Physic()
     : ax(0), ay(0), vx(0), vy(0), gravity_enabled(true)
@@ -121,25 +115,18 @@ Physic::enable_gravity(bool enable_gravity)
   gravity_enabled = enable_gravity;
 }
 
-void
-Physic::apply(float elapsed_time, float &x, float &y)
+Vector
+Physic::get_movement(float elapsed_time)
 {
-  float gravity = Sector::current()->gravity;
-  float grav;
-  if(gravity_enabled)
-    grav = gravity / 100.0;
-  else
-    grav = 0;
-
-  x += vx * elapsed_time + ax * elapsed_time * elapsed_time;
-  y += vy * elapsed_time + (ay + grav) * elapsed_time * elapsed_time;
+  float grav = gravity_enabled ? 1000 : 0;
+  
+  Vector result(
+      vx * elapsed_time + ax * elapsed_time * elapsed_time,
+      vy * elapsed_time + (ay + grav) * elapsed_time * elapsed_time
+  );
   vx += ax * elapsed_time;
-  vy += (ay + grav) * elapsed_time;
-}
+  vy += (ay + grav) * elapsed_time;  
 
-void
-Physic::apply(Vector& vector, float elapsed_time)
-{
-  apply(elapsed_time, vector.x, vector.y);
+  return result;
 }