Merge pull request #2035 from Semphriss/water-floor

Replaced gentle pushback with hard floor when Tux is swimming at the bottom of a sector

Author: Semphriss

src/object/player.cpp

@@ -129,9 +129,6 @@ const float SMALL_TUX_HEIGHT = 30.8f;
 const float BIG_TUX_HEIGHT = 62.8f;
 const float DUCKED_TUX_HEIGHT = 31.8f;
 
-/** when Tux swims down and approaches the bottom of the screen, push him back up with that strength */
-const float WATER_FALLOUT_FORCEBACK_STRENGTH = 1024.f;
-
 bool no_water = true;
 
 } // namespace
@@ -152,7 +149,6 @@ Player::Player(PlayerStatus& player_status, const std::string& name_) :
   m_peekingY(Direction::AUTO),
   m_ability_time(),
   m_stone(false),
-  m_falling_below_water(false),
   m_swimming(false),
   m_swimboosting(false),
   m_on_left_wall(false),
@@ -526,16 +522,6 @@ Player::update(float dt_sec)
     m_second_growup_sound_timer.stop();
   }
 
-  // Handle player approaching the bottom of the screen while swimming
-  if (m_falling_below_water) {
-    m_physic.set_velocity_y(std::min(m_physic.get_velocity_y(), 0.f));
-  }
-
-  if ((get_pos().y > Sector::get().get_height() - m_col.m_bbox.get_height()) && (!m_ghost_mode && m_swimming))
-  {
-    m_physic.set_acceleration_y(-WATER_FALLOUT_FORCEBACK_STRENGTH);
-  }
-
   if (m_boost != 0.f)
   {
     bool sign = std::signbit(m_boost);
@@ -2004,16 +1990,13 @@ Player::check_bounds()
     set_pos(Vector(Sector::get().get_width() - m_col.m_bbox.get_width(), m_col.m_bbox.get_top()));
   }
 
-  m_falling_below_water = false;
+  // If Tux is swimming, don't allow him to go below the sector
+  if (m_swimming && !m_ghost_mode && m_col.m_bbox.get_bottom() > Sector::get().get_height()) {
+    set_pos(Vector(m_col.m_bbox.get_left(), Sector::get().get_height() - m_col.m_bbox.get_height()));
+  }
 
   /* fallen out of the level? */
-  if (m_swimming) {
-    // If swimming, don't kill; just prevent from falling below the ground
-    if ((get_pos().y > Sector::get().get_height() - 1) && (!m_ghost_mode)) {
-      set_pos(Vector(get_pos().x, Sector::get().get_height() - 1));
-      m_falling_below_water = true;
-    }
-  } else if ((get_pos().y > Sector::get().get_height()) && (!m_ghost_mode)) {
+  if ((get_pos().y > Sector::get().get_height()) && (!m_ghost_mode)) {
     kill(true);
     return;
   }

src/object/player.hpp

@@ -267,7 +267,6 @@ class Player final : public MovingObject,
   Direction m_peekingY;
   float m_ability_time;
   bool m_stone;
-  bool m_falling_below_water;
   bool m_swimming;
   bool m_swimboosting;
   bool m_on_left_wall;