Fix trampoline bounce triggered by stale jump-cut state

src/object/bounce_jump_state.cpp

@@ -0,0 +1,17 @@
+//  SuperTux
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+
+#include "object/bounce_jump_state.hpp"
+
+void
+clear_player_bounce_state(PlayerBounceState& state)
+{
+  state.jumping = false;
+  state.slidejump_falling = false;
+  state.jump_early_apex = false;
+  state.gravity_modifier = 1.0f;
+}

src/object/bounce_jump_state.hpp

@@ -0,0 +1,18 @@
+//  SuperTux
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+
+#pragma once
+
+struct PlayerBounceState
+{
+  bool jumping;
+  bool slidejump_falling;
+  bool jump_early_apex;
+  float gravity_modifier;
+};
+
+void clear_player_bounce_state(PlayerBounceState& state);

src/object/player.cpp

@@ -31,6 +31,7 @@
 #include "object/brick.hpp"
 #include "object/bullet.hpp"
 #include "object/camera.hpp"
+#include "object/bounce_jump_state.hpp"
 #include "object/display_effect.hpp"
 #include "object/falling_coin.hpp"
 #include "object/key.hpp"
@@ -1459,6 +1460,24 @@ Player::do_jump(float yspeed) {
   }
 }
 
+void
+Player::clear_jump_state_for_bounce()
+{
+  PlayerBounceState state{
+    m_jumping,
+    m_is_slidejump_falling,
+    m_jump_early_apex,
+    m_physic.get_gravity_modifier()
+  };
+
+  clear_player_bounce_state(state);
+
+  m_jumping = state.jumping;
+  m_is_slidejump_falling = state.slidejump_falling;
+  m_jump_early_apex = state.jump_early_apex;
+  m_physic.set_gravity_modifier(state.gravity_modifier);
+}
+
 void
 Player::early_jump_apex()
 {

src/object/player.hpp

@@ -261,6 +261,8 @@ class Player final : public MovingSprite
    */
   void do_jump(float yspeed);
 
+  void clear_jump_state_for_bounce();
+
   /** Adds velocity to the player (be careful when using this) */
   void add_velocity(const Vector& velocity);
 

src/object/rusty_trampoline.cpp

@@ -81,6 +81,8 @@ RustyTrampoline::collision(MovingObject& other, const CollisionHit& hit)
       float vy = player->get_physic().get_velocity_y();
       //player is falling down on trampoline
       if (hit.top && vy >= 0) {
+        player->clear_jump_state_for_bounce();
+
         if (player->get_controller().hold(Control::JUMP)) {
           vy = VY_TRIGGER;
         } else {

src/object/trampoline.cpp

@@ -108,6 +108,8 @@ Trampoline::collision(MovingObject& other, const CollisionHit& hit)
     //player is falling down on trampoline
     if (hit.top && vy >= 0)
     {
+      player->clear_jump_state_for_bounce();
+
       if (!(player->get_status().bonus[player->get_id()] == BONUS_AIR))
       {
         if (player->get_controller().hold(Control::JUMP))