[Super-tux-commit] supertux/src world.cpp,1.65,1.66

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14089/src

Modified Files:
	world.cpp 
Log Message:
This should work, i guess...

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- world.cpp	6 May 2004 12:47:45 -0000	1.65
+++ world.cpp	6 May 2004 15:03:24 -0000	1.66
@@ -340,9 +340,13 @@
           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;
 
     }