Fix bonusblock terrible sound (#3404)

fixes #3350
fixes #3359

Author: Hypernoot

src/collision/collision_hit.hpp

@@ -57,4 +57,16 @@ class CollisionHit final
   bool crush;
 
   Vector slope_normal;
+  
+  inline bool has_direction() const {
+    return left || right || top || bottom;
+  }
+
+  inline bool is_vertical() const {
+    return top || bottom;
+  }
+
+  inline bool is_horizontal() const {
+    return left || right;
+  }
 };

src/object/block.cpp

@@ -65,8 +65,12 @@ Block::Block(const ReaderMapping& mapping, const std::string& sprite_file) :
 }
 
 HitResponse
-Block::collision(MovingObject& other, const CollisionHit& )
+Block::collision(MovingObject& other, const CollisionHit& hit_)
 {
+  if (!hit_.has_direction()) {
+    return FORCE_MOVE;
+  }
+
   auto player = dynamic_cast<Player*> (&other);
   if (player)
   {

src/object/bonus_block.cpp

@@ -300,37 +300,40 @@ BonusBlock::hit(Player& player)
 HitResponse
 BonusBlock::collision(MovingObject& other, const CollisionHit& hit_)
 {
-  auto player = dynamic_cast<Player*> (&other);
-  if (player) {
-    if (player->m_does_buttjump ||
-      (player->is_swimboosting() && player->get_bbox().get_bottom() < m_col.m_bbox.get_top() + SHIFT_DELTA))
-    {
-      try_drop(player);
+  if (hit_.has_direction()) {
+    auto player = dynamic_cast<Player*> (&other);
+    if (player) {
+      if (player->m_does_buttjump ||
+        (player->is_swimboosting() && player->get_bbox().get_bottom() < m_col.m_bbox.get_top() + SHIFT_DELTA))
+      {
+        try_drop(player);
+      }
     }
-  }
 
-  auto badguy = dynamic_cast<BadGuy*> (&other);
-  if (badguy) {
-    // Hit contains no information for collisions with blocks.
-    // Badguy's bottom has to be below the top of the block
-    // SHIFT_DELTA is required to slide over one tile gaps.
-    if ( badguy->can_break() && ( badguy->get_bbox().get_bottom() > m_col.m_bbox.get_top() + SHIFT_DELTA ) ) {
-      try_open(player);
+    auto badguy = dynamic_cast<BadGuy*> (&other);
+    if (badguy) {
+      // Hit contains no information for collisions with blocks.
+      // Badguy's bottom has to be below the top of the block
+      // SHIFT_DELTA is required to slide over one tile gaps.
+      if ( badguy->can_break() && ( badguy->get_bbox().get_bottom() > m_col.m_bbox.get_top() + SHIFT_DELTA ) ) {
+        try_open(player);
+      }
     }
-  }
-
-  auto crusher = dynamic_cast<Crusher*> (&other);
-  if (crusher)
-  {
-    try_open(player);
-  }
 
-  auto portable = dynamic_cast<Portable*> (&other);
-  if (portable && !badguy) {
-    if (other.get_bbox().get_top() > m_col.m_bbox.get_bottom() - SHIFT_DELTA) {
+    auto crusher = dynamic_cast<Crusher*> (&other);
+    if (crusher)
+    {
       try_open(player);
     }
+
+    auto portable = dynamic_cast<Portable*> (&other);
+    if (portable && !badguy) {
+      if (other.get_bbox().get_top() > m_col.m_bbox.get_bottom() - SHIFT_DELTA) {
+        try_open(player);
+      }
+    }
   }
+
   return Block::collision(other, hit_);
 }
 

src/object/brick.cpp

@@ -85,34 +85,36 @@ Brick::hit(Player& player)
 HitResponse
 Brick::collision(MovingObject& other, const CollisionHit& hit)
 {
-  auto player = dynamic_cast<Player*> (&other);
-  if (player && player->m_does_buttjump) try_break(player);
-
-  auto badguy = dynamic_cast<BadGuy*> (&other);
-  if (badguy) {
-    // Hit contains no information for collisions with blocks.
-    // Badguy's bottom has to be below the top of the brick
-    // SHIFT_DELTA is required to slide over one tile gaps.
-    if ( badguy->can_break() && ( badguy->get_bbox().get_bottom() > m_col.m_bbox.get_top() + SHIFT_DELTA ) ) {
-      try_break(nullptr);
+  if (hit.has_direction()) {
+    auto player = dynamic_cast<Player*> (&other);
+    if (player && player->m_does_buttjump) try_break(player);
+
+    auto badguy = dynamic_cast<BadGuy*> (&other);
+    if (badguy) {
+      // Hit contains no information for collisions with blocks.
+      // Badguy's bottom has to be below the top of the brick
+      // SHIFT_DELTA is required to slide over one tile gaps.
+      if ( badguy->can_break() && ( badguy->get_bbox().get_bottom() > m_col.m_bbox.get_top() + SHIFT_DELTA ) ) {
+        try_break(nullptr);
+      }
     }
-  }
-  auto portable = dynamic_cast<Portable*> (&other);
-  if (portable && !badguy) {
-    if (other.get_bbox().get_top() > m_col.m_bbox.get_bottom() - SHIFT_DELTA) {
+    auto portable = dynamic_cast<Portable*> (&other);
+    if (portable && !badguy) {
+      if (other.get_bbox().get_top() > m_col.m_bbox.get_bottom() - SHIFT_DELTA) {
+        try_break(nullptr);
+      }
+    }
+
+    auto explosion = dynamic_cast<Explosion*> (&other);
+    if (explosion && explosion->hurts()) {
       try_break(nullptr);
     }
-  }
 
-  auto explosion = dynamic_cast<Explosion*> (&other);
-  if (explosion && explosion->hurts()) {
-    try_break(nullptr);
+    auto crusher = dynamic_cast<Crusher*> (&other);
+    if (crusher && crusher->get_state() == Crusher::CRUSHING && m_coin_counter == 0)
+      try_break(nullptr);
   }
 
-  auto crusher = dynamic_cast<Crusher*> (&other);
-  if (crusher && crusher->get_state() == Crusher::CRUSHING && m_coin_counter == 0)
-    try_break(nullptr);
-
   return Block::collision(other, hit);
 }
 

src/object/infoblock.cpp

@@ -125,11 +125,14 @@ InfoBlock::hit(Player& player)
 HitResponse
 InfoBlock::collision(MovingObject& other, const CollisionHit& hit_)
 {
-  auto player = dynamic_cast<Player*> (&other);
-  if (player && player->m_does_buttjump)
-  {
-    InfoBlock::hit(*player);
+  if (hit_.has_direction()) {
+    auto player = dynamic_cast<Player*> (&other);
+    if (player && player->m_does_buttjump)
+    {
+      InfoBlock::hit(*player);
+    }
   }
+
   return Block::collision(other, hit_);
 }