From 33b66711ec8c2f563a454f386a678eedd20a64a7 Mon Sep 17 00:00:00 2001 From: LMH Date: Sat, 15 Nov 2014 13:17:02 -1000 Subject: [PATCH] Butt-jump stops gliding --- src/object/player.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/object/player.cpp b/src/object/player.cpp index 3af291c84..a6aeed78b 100644 --- a/src/object/player.cpp +++ b/src/object/player.cpp @@ -734,7 +734,8 @@ Player::handle_vertical_input() ability_timer.start(glide_time); else if (ability_timer.started()) { log_debug << ability_timer.get_timeleft() << std::endl; - if (ability_timer.get_timeleft() <= 0.05f) { + // glide stops after some duration or if buttjump is initiated + if ((ability_timer.get_timeleft() <= 0.05f) || controller->hold(Controller::DOWN)) { glide_time = 0; ability_timer.stop(); } else { -- 2.11.0