Textscroller tweak to prevent jumping when 'Jump with Up' is enabled

diff --git a/src/supertux/textscroller.cpp b/src/supertux/textscroller.cpp
index 9fffbba..be8fca5 100644 (file)
--- a/src/supertux/textscroller.cpp
+++ b/src/supertux/textscroller.cpp
@@ -101,9 +101,10 @@ TextScroller::update(float elapsed_time)
   } else {
     speed = defaultspeed;
   }
-  if(controller->pressed(Controller::JUMP)
+  if((controller->pressed(Controller::JUMP)
      || controller->pressed(Controller::ACTION)
-     || controller->pressed(Controller::MENU_SELECT))
+     || controller->pressed(Controller::MENU_SELECT)
+     )&& !(controller->pressed(Controller::UP))) // prevent skipping if jump with up is enabled
     scroll += SCROLL;
   if(controller->pressed(Controller::PAUSE_MENU)) {
     g_screen_manager->exit_screen(new FadeOut(0.5));