From aa5a16779bd88ee966db51e5b74b344de2ead375 Mon Sep 17 00:00:00 2001 From: Ryan Flegel Date: Tue, 11 May 2004 18:16:12 +0000 Subject: [PATCH] - made fixes to buttjump - add score multiplier when in invincibility mode SVN-Revision: 1108 --- src/player.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/player.cpp b/src/player.cpp index 1288c6658..cfffa8221 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -218,7 +218,8 @@ Player::action(double frame_ratio) physic.enable_gravity(false); /* Reset score multiplier (for multi-hits): */ - player_status.score_multiplier = 1; + if (!invincible_timer.started()) + player_status.score_multiplier = 1; } if(jumped_in_solid) @@ -412,12 +413,11 @@ Player::handle_vertical_input() butt_jump = false; if (input.down == DOWN && butt_jump && on_ground()) { - // FIXME: Currently only breaks the block if his middle is on top of it - if (isbrick(base.x + base.width/2, base.y + base.height)) - { - World::current()->trybreakbrick(base.x + base.width/2, base.y + base.height, false); - bumpbrick(base.x, base.y); - } + if (isbrick(base.x, base.y + base.height)) + World::current()->trybreakbrick(base.x, base.y + base.height, false); + if (isbrick(base.x + base.width, base.y + base.height)) + World::current()->trybreakbrick(base.x + base.width, base.y + base.height, false); + butt_jump = false; } -- 2.11.0