From: Ricardo Cruz <rick2@aeiou.pt>
Date: Thu, 6 May 2004 15:03:24 +0000 (+0000)
Subject: This should work, i guess...
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=abe456dc1bcbed875770ed66b3deaa39b95b0a2c;p=supertux.git

This should work, i guess...

SVN-Revision: 1006
---

diff --git a/src/world.cpp b/src/world.cpp
index 1256420d9..7c284003e 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -340,9 +340,13 @@ void World::scrolling(double frame_ratio)
           final_scroll_x = tux_pos_x - X_SPACE;
       }
 
-      scroll_x +=   (final_scroll_x - scroll_x)
+/*      scroll_x +=   (final_scroll_x - scroll_x)
                   / (frame_ratio * (CHANGE_DIR_SCROLL_SPEED / 100))
                   + (tux.physic.get_velocity_x() * frame_ratio + tux.physic.get_acceleration_x() * frame_ratio * frame_ratio);
+*/
+
+scroll_x += ((final_scroll_x - scroll_x) / CHANGE_DIR_SCROLL_SPEED) * frame_ratio;
+
       // std::cerr << tux_pos_x << " " << final_scroll_x << " " << scroll_x << std::endl;
 
     }