From 3073e1ba349c05076a411f90cc8fa3f6b886eeb5 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 11 Feb 2010 07:51:49 +0000 Subject: [PATCH] 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. SVN-Revision: 6312 --- src/object/player.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 { -- 2.11.0