X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fphysic.cpp;h=cdc37879f755c219b8482f3e01f07e731993c03b;hb=fb8cef6efacc0dff5faaff6dc4aa638289285099;hp=518ce8349b7556cb1bcca0b222198feb5d5b2f68;hpb=36afad72b6c66d4619372892f589a4131afed638;p=supertux.git

diff --git a/src/physic.cpp b/src/physic.cpp
index 518ce8349..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)
+    : ax(0), ay(0), vx(0), vy(0), gravity_enabled_flag(true), gravity(10 * 100)
 {
 }
 
@@ -141,18 +141,26 @@ Physic::gravity_enabled() const
   return gravity_enabled_flag;
 }
 
+void
+Physic::set_gravity(float gravity)
+{
+  this->gravity = gravity * 100;
+}
+
+float
+Physic::get_gravity() const
+{
+  return gravity / 100;
+}
+
 Vector
 Physic::get_movement(float elapsed_time)
 {
-  float grav = gravity_enabled_flag ? 1000 : 0;
-  
-  Vector result(
-      vx * elapsed_time + ax * elapsed_time * elapsed_time,
-      vy * elapsed_time + (ay + grav) * elapsed_time * elapsed_time
-  );
+  float grav = gravity_enabled_flag ? gravity : 0;
+
   vx += ax * elapsed_time;
-  vy += (ay + grav) * elapsed_time;  
+  vy += (ay + grav) * elapsed_time;
+  Vector result(vx * elapsed_time, vy * elapsed_time);
 
   return result;
 }
-