Prevent "Return to Level Editor" from working, if no levelsubset is loaded. This...

[supertux.git] / src / world.cpp

diff --git a/src/world.cpp b/src/world.cpp
index 9a2b5e2..3322b9f 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -261,6 +261,7 @@ void
 World::action(double frame_ratio)
 {
   tux.action(frame_ratio);
+  tux.check_bounds(level->back_scrolling, (bool)level->hor_autoscroll_speed);
   scrolling(frame_ratio);
 
   /* Handle bouncy distros: */
@@ -318,6 +319,12 @@ World::action(double frame_ratio)
 /* This functions takes cares of the scrolling */
 void World::scrolling(double frame_ratio)
 {
+  if(level->hor_autoscroll_speed)
+    {
+    scroll_x += level->hor_autoscroll_speed * frame_ratio;
+    return;
+    }
+
   int tux_pos_x = (int)(tux.base.x + (tux.base.width/2));
 
   if (level->back_scrolling || debug_mode)
@@ -340,7 +347,9 @@ void World::scrolling(double frame_ratio)
           final_scroll_x = tux_pos_x - X_SPACE;
       }
 
-      scroll_x += (final_scroll_x - scroll_x) / (frame_ratio * (CHANGE_DIR_SCROLL_SPEED / 100));
+      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);
       // std::cerr << tux_pos_x << " " << final_scroll_x << " " << scroll_x << std::endl;
 
     }