X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fphysic.cpp;h=cdc37879f755c219b8482f3e01f07e731993c03b;hb=8c0b10ba9ff57a36c3747c84a035faca5975556d;hp=d7993cd3066071c12841813079cfe026866f951b;hpb=3655d32f63f75b2af054ec68d4176e55a561ba96;p=supertux.git

diff --git a/src/physic.cpp b/src/physic.cpp
index d7993cd30..cdc37879f 100644
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -23,7 +23,7 @@
 #include "physic.hpp"
 
 Physic::Physic()
-    : ax(0), ay(0), vx(0), vy(0), gravity_enabled_flag(true), gravity(1000)
+    : ax(0), ay(0), vx(0), vy(0), gravity_enabled_flag(true), gravity(10 * 100)
 {
 }
 
@@ -144,13 +144,13 @@ Physic::gravity_enabled() const
 void
 Physic::set_gravity(float gravity)
 {
-  this->gravity = gravity;
+  this->gravity = gravity * 100;
 }
 
 float
 Physic::get_gravity() const
 {
-  return gravity;
+  return gravity / 100;
 }
 
 Vector
@@ -158,12 +158,9 @@ Physic::get_movement(float elapsed_time)
 {
   float grav = gravity_enabled_flag ? gravity : 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;
+  Vector result(vx * elapsed_time, vy * elapsed_time);
 
   return result;
 }