make thrown bombs explode on impact with badguys and players

SuperTux · Aug 17, 2023 · f65224d · f65224d
1 parent 864ff52
commit f65224d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp
@@ -60,12 +60,16 @@ Bomb::collision_solid(const CollisionHit& hit)
 HitResponse
 Bomb::collision_player(Player& , const CollisionHit& )
 {
+  if (m_physic.get_velocity() != Vector(0.f, 0.f))
+    explode();
   return ABORT_MOVE;
 }
 
 HitResponse
 Bomb::collision_badguy(BadGuy& , const CollisionHit& )
 {
+  if (m_physic.get_velocity() != Vector(0.f, 0.f))
+    explode();
   return ABORT_MOVE;
 }
 

diff --git a/src/badguy/goldbomb.cpp b/src/badguy/goldbomb.cpp
@@ -63,6 +63,8 @@ HitResponse
 GoldBomb::collision(GameObject& object, const CollisionHit& hit)
 {
   if (tstate == STATE_TICKING) {
+    if (m_physic.get_velocity() != Vector(0.f, 0.f))
+      kill_fall();
     if ( dynamic_cast<Player*>(&object) ) {
       return ABORT_MOVE;
     }
@@ -79,7 +81,11 @@ HitResponse
 GoldBomb::collision_player(Player& player, const CollisionHit& hit)
 {
   if (tstate == STATE_TICKING)
+  {
+    if (m_physic.get_velocity() != Vector(0.f, 0.f))
+      kill_fall();
     return FORCE_MOVE;
+  }
   if (is_grabbed())
     return FORCE_MOVE;
   return BadGuy::collision_player(player, hit);
@@ -89,7 +95,11 @@ HitResponse
 GoldBomb::collision_badguy(BadGuy& badguy, const CollisionHit& hit)
 {
   if (tstate == STATE_TICKING)
+  {
+    if (m_physic.get_velocity() != Vector(0.f, 0.f))
+      kill_fall();
     return FORCE_MOVE;
+  }
   return WalkingBadguy::collision_badguy(badguy, hit);
 }