From: florianf <florianf@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Date: Thu, 11 Feb 2010 07:51:49 +0000 (+0000)
Subject: Bug 577: (Re)allow Player to low-jump from a stopped position.
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a2ad612a75ccf43aedf891d9a7aaaf6ae24f3940;p=supertux.git

Bug 577: (Re)allow Player to low-jump from a stopped position.

Reverts the player controls change from r6272 (bug 577).
Thanks to Matt McCutchen for this patch.


git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6312 837edb03-e0f3-0310-88ca-d4d4e8b29345
---

diff --git a/src/object/player.cpp b/src/object/player.cpp
index 393429a43..3cc8a3c61 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -656,10 +656,15 @@ Player::handle_vertical_input()
   if(controller->hold(Controller::JUMP) && jump_button_timer.started() && can_jump) {
     jump_button_timer.stop();
     if (duck) {
-      // jump a little bit if moving in same direction; otherwise, do a backflip
-      if ((physic.get_velocity_x() < 0 && dir == LEFT) || (physic.get_velocity_x() > 0 && dir == RIGHT)) {
+      // when running, only jump a little bit; else do a backflip
+      if ((physic.get_velocity_x() != 0) || 
+          (controller->hold(Controller::LEFT)) || 
+          (controller->hold(Controller::RIGHT))) 
+      {
         do_jump(-300);
-      } else {
+      }
+      else 
+      {
         do_backflip();
       }
     } else {