From: LMH <lmh.0013@gmail.com>
Date: Wed, 19 Jun 2013 18:37:28 +0000 (-1000)
Subject: Textscroller tweak to prevent jumping when 'Jump with Up' is enabled
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=661acf506ee79953fb0eead4bda574ac02a4d79f;p=supertux.git

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

diff --git a/src/supertux/textscroller.cpp b/src/supertux/textscroller.cpp
index 9fffbbaaf..be8fca532 100644
--- 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));