Remove the ignore horizontal crush member

SuperTux · Dec 7, 2024 · d10fc53 · d10fc53
1 parent 6db5648
commit d10fc53
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 25 deletions.
diff --git a/src/badguy/crusher.cpp b/src/badguy/crusher.cpp
@@ -131,21 +131,18 @@ Crusher::collision(GameObject& other, const CollisionHit& hit)
 
   // If the other object is the player, and the collision is at the
   // bottom of the crusher, hurt the player.
-  if (player && is_crushing && 
-    ((crushed_bottom && player->on_ground()) || crushed_sideways)) {
+  if (player && is_crushing &&
+    ((crushed_bottom && player->on_ground()) || crushed_sideways))
+  {
     SoundManager::current()->play("sounds/brick.wav", get_pos());
     set_state(RECOVERING);
+
     if (player->is_invincible()) {
       return ABORT_MOVE;
     }
-    if(crushed_sideways)
-    {
-      // TODO: Is there a better method than introducing 
-      // a completely new player method (e.g. by returning 
-      // ABORT_MOVE from this function)?
-      player->ignore_sideways_crush();
-    }
+
     player->kill(false);
+
     return FORCE_MOVE;
   }
 

diff --git a/src/object/player.cpp b/src/object/player.cpp
@@ -185,7 +185,6 @@ Player::Player(PlayerStatus& player_status, const std::string& name_, int player
   m_jump_early_apex(false),
   m_on_ice(false),
   m_ice_this_frame(false),
-  m_ignore_sideways_crush(false),
   //m_santahatsprite(SpriteManager::current()->create("images/creatures/tux/santahat.sprite")),
   m_multiplayer_arrow(SpriteManager::current()->create("images/engine/hud/arrowdown.png")),
   m_tag_timer(),
@@ -2323,19 +2322,8 @@ Player::collision_solid(const CollisionHit& hit)
     m_physic.set_velocity_x(0);
   }
 
-  // crushed?
-  if (hit.crush) {
-    if ((hit.left || hit.right)) {
-      if (m_ignore_sideways_crush) {
-        m_ignore_sideways_crush = false;
-      }
-      else {
-        kill(true);
-      }
-    } else if (hit.top || hit.bottom) {
-      kill(false);
-    }
-  }
+  if (hit.crush)
+    kill(false);
 
   if ((hit.left && m_boost < 0.f) || (hit.right && m_boost > 0.f))
     m_boost = 0.f;

diff --git a/src/object/player.hpp b/src/object/player.hpp
@@ -425,7 +425,6 @@ class Player final : public MovingObject
   void remove_collected_key(Key* key);
 
   bool track_state() const override { return false; }
-  void ignore_sideways_crush() { m_ignore_sideways_crush = true; }
 
 private:
   void handle_input();
@@ -501,7 +500,6 @@ class Player final : public MovingObject
   bool m_jump_early_apex;
   bool m_on_ice;
   bool m_ice_this_frame;
-  bool m_ignore_sideways_crush;
   //SpritePtr m_santahatsprite;
   SpritePtr m_multiplayer_arrow;