From: LMH <lmh.0013@gmail.com>
Date: Sat, 15 Nov 2014 23:17:02 +0000 (-1000)
Subject: Butt-jump stops gliding
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=33b66711ec8c2f563a454f386a678eedd20a64a7;p=supertux.git

Butt-jump stops gliding
---

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 {