Made trampolines less likely to interfere with level design:

[supertux.git] / src / object / block.cpp

diff --git a/src/object/block.cpp b/src/object/block.cpp
index 95520d6..fb90272 100644 (file)
--- a/src/object/block.cpp
+++ b/src/object/block.cpp
@@ -202,6 +202,20 @@ BonusBlock::hit(Player& )
   try_open();
 }
 
+HitResponse
+BonusBlock::collision(GameObject& other, const CollisionHit& hit){
+    BadGuy* 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 bonusblock
+      // +7 is required to slide over one tile gaps.
+      if( badguy->can_break() && ( badguy->get_bbox().get_bottom() > get_bbox().get_top() + 7.0) ){
+        try_open();
+      }
+    }
+    return Block::collision(other, hit);
+}
+
 void
 BonusBlock::try_open()
 {
@@ -286,6 +300,20 @@ Brick::hit(Player& )
   try_break(true);
 }
 
+HitResponse
+Brick::collision(GameObject& other, const CollisionHit& hit){
+    BadGuy* 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
+      // +7 is required to slide over one tile gaps.
+      if( badguy->can_break() && ( badguy->get_bbox().get_bottom() > get_bbox().get_top() + 7.0 ) ){
+        try_break(false);
+      }
+    }
+   return Block::collision(other, hit);
+}
+
 void
 Brick::try_break(bool playerhit)
 {