From 0c17ebfc58c6333f15931b5887ca4c34afdc5a2f Mon Sep 17 00:00:00 2001 From: Wolfgang Becker Date: Fri, 14 Jul 2006 18:07:05 +0000 Subject: [PATCH] Badguys break bricks based on hitbox instead of position. SVN-Revision: 4005 --- src/object/block.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/object/block.cpp b/src/object/block.cpp index ce727af85..fb90272d7 100644 --- a/src/object/block.cpp +++ b/src/object/block.cpp @@ -205,9 +205,11 @@ BonusBlock::hit(Player& ) HitResponse BonusBlock::collision(GameObject& other, const CollisionHit& hit){ BadGuy* badguy = dynamic_cast (&other); - if(badguy) { - // if( badguy->can_break() && (hit.left||hit.right||hit.bottom) ){ //TODO: find out why hit contains no information and fix it - if( badguy->can_break() && ( badguy->get_pos().y > get_pos().y ) ){ + 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(); } } @@ -302,8 +304,10 @@ HitResponse Brick::collision(GameObject& other, const CollisionHit& hit){ BadGuy* badguy = dynamic_cast (&other); if(badguy) { - // if( badguy->can_break() && (hit.left||hit.right||hit.bottom) ){ //TODO: find out why hit contains no information and fix it - if( badguy->can_break() && ( badguy->get_pos().y > get_pos().y ) ){ + // 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); } } -- 2.11.0