Changed default gravity to 10.0

SVN-Revision: 4535

diff --git a/data/levels/world1/27 - No More Mr Ice Guy.stl b/data/levels/world1/27 - No More Mr Ice Guy.stl
index 96d81d0..3ceffd2 100644 (file)
--- a/data/levels/world1/27 - No More Mr Ice Guy.stl
+++ b/data/levels/world1/27 - No More Mr Ice Guy.stl
@@ -6,7 +6,6 @@
   (sector
     (name  "main")
     (music  "music/bossattack.ogg")
-    (gravity 1000.000000)
     (tilemap
       (z-pos -100)
       (solid #f)

diff --git a/src/physic.cpp b/src/physic.cpp
index d7993cd..5da55a3 100644 (file)
--- 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

diff --git a/src/physic.hpp b/src/physic.hpp
index 037d85e..3922180 100644 (file)
--- a/src/physic.hpp
+++ b/src/physic.hpp
@@ -81,9 +81,9 @@ private:
   float ax, ay;
   /// horizontal and vertical velocity
   float vx, vy;
-  /// should we respect gravity in out calculations?
+  /// should we respect gravity in our calculations?
   bool gravity_enabled_flag;
-  /// current gravity to apply to object, if enabled
+  /// current gravity (multiplied by 100) to apply to object, if enabled
   float gravity;
 };
 

diff --git a/src/sector.cpp b/src/sector.cpp
index c306517..4380472 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -74,7 +74,7 @@ bool Sector::draw_solids_only = false;
 
 Sector::Sector(Level* parent)
   : level(parent), currentmusic(LEVEL_MUSIC),
-  ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), gravity(1000.0), player(0), camera(0) 
+  ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), gravity(10.0), player(0), camera(0) 
 {
   add_object(new Player(player_status, "Tux"));
   add_object(new DisplayEffect("Effect"));