From 7ade08c05464cd2d3ab85fcaad99f2170c08f4df Mon Sep 17 00:00:00 2001 From: Ryan Flegel Date: Fri, 28 Apr 2006 04:04:44 +0000 Subject: [PATCH] Fixed bug I introduced with last commit SVN-Revision: 3457 --- src/badguy/mriceblock.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp index 1ec23a9f5..74b515dda 100644 --- a/src/badguy/mriceblock.cpp +++ b/src/badguy/mriceblock.cpp @@ -148,18 +148,16 @@ MrIceBlock::collision_player(Player& player, const CollisionHit& hit) // handle kicks from left or right side if(ice_state == ICESTATE_FLAT && get_state() == STATE_ACTIVE) { - // Don't kick if the player is going to pick us up - if (player.get_controller()->hold(Controller::ACTION)) - return FORCE_MOVE; - // hit from left side - if(hit.normal.x > 0.7) { + if(hit.normal.x > 0.7 && + !player.get_controller()->hold(Controller::ACTION)) { dir = RIGHT; player.kick(); set_state(ICESTATE_KICKED); return FORCE_MOVE; } - else if(hit.normal.x < -0.7) { + else if(hit.normal.x < -0.7 && + !player.get_controller()->hold(Controller::ACTION)) { dir = LEFT; player.kick(); set_state(ICESTATE_KICKED); -- 2.11.0