- data/levels/default/ moved to data/levels/worldmap/

[supertux.git] / src / physic.cpp

diff --git a/src/physic.cpp b/src/physic.cpp
index 3b90c6e..7300b9e 100644 (file)
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -24,7 +24,7 @@
 #include "defines.h"
 #include "physic.h"
 #include "timer.h"
-#include "world.h"
+#include "sector.h"
 #include "level.h"
 
 Physic::Physic()
@@ -46,7 +46,7 @@ Physic::reset()
 void
 Physic::set_velocity_x(float nvx)
 {
-  vx = -nvx;
+  vx = nvx;
 }
 
 void
@@ -58,8 +58,8 @@ Physic::set_velocity_y(float nvy)
 void
 Physic::set_velocity(float nvx, float nvy)
 {
-    vx = nvx;
-    vy = -nvy;
+  vx = nvx;
+  vy = -nvy;
 }
 
 void Physic::inverse_velocity_x()
@@ -122,17 +122,24 @@ Physic::enable_gravity(bool enable_gravity)
 }
 
 void
-Physic::apply(float frame_ratio, float &x, float &y)
+Physic::apply(float elapsed_time, float &x, float &y)
 {
-  float gravity = World::current()->get_level()->gravity;
+  float gravity = Sector::current()->gravity;
   float grav;
   if(gravity_enabled)
     grav = gravity / 100.0;
   else
     grav = 0;
 
-  x += vx * frame_ratio + ax * frame_ratio * frame_ratio;
-  y += vy * frame_ratio + (ay + grav) * frame_ratio * frame_ratio;
-  vx += ax * frame_ratio;
-  vy += (ay + grav) * frame_ratio;
+  x += vx * elapsed_time + ax * elapsed_time * elapsed_time;
+  y += vy * elapsed_time + (ay + grav) * elapsed_time * elapsed_time;
+  vx += ax * elapsed_time;
+  vy += (ay + grav) * elapsed_time;
+}
+
+void
+Physic::apply(Vector& vector, float elapsed_time)
+{
+  apply(elapsed_time, vector.x, vector.y);
 }
+