X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fblock.cpp;h=b9fae8393f8e80f026bc8707a41b80ddbdd7a4e2;hb=77d00a6f464cc87c6b50cf1f3b38064a7ae9aead;hp=ac5bc577c52c8bd73c2d2ba51020b848b9f3e07d;hpb=d62647592b4ccffa89794af6fa03faaced46999d;p=supertux.git diff --git a/src/object/block.cpp b/src/object/block.cpp index ac5bc577c..b9fae8393 100644 --- a/src/object/block.cpp +++ b/src/object/block.cpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,14 +12,15 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -// 02111-1307, USA. +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include #include "block.hpp" +#include "log.hpp" #include @@ -52,7 +53,8 @@ Block::Block(Sprite* newsprite) { bbox.set_size(32, 32.1); set_group(COLGROUP_STATIC); - flags |= FLAG_SOLID; + sound_manager->preload("sounds/upgrade.wav"); + sound_manager->preload("sounds/brick.wav"); } Block::~Block() @@ -61,12 +63,11 @@ Block::~Block() } HitResponse -Block::collision(GameObject& other, const CollisionHit& hitdata) +Block::collision(GameObject& other, const CollisionHit& ) { Player* player = dynamic_cast (&other); if(player) { - // collided from below? - if(hitdata.normal.x == 0 && hitdata.normal.y < 0) { + if(player->get_bbox().get_top() > get_bbox().get_bottom() - 7.0) { hit(*player); } } @@ -82,7 +83,7 @@ Block::collision(GameObject& other, const CollisionHit& hitdata) } } - return FORCE_MOVE; + return SOLID; } void @@ -90,7 +91,7 @@ Block::update(float elapsed_time) { if(!bouncing) return; - + float offset = original_y - get_pos().y; if(offset > BOUNCY_BRICK_MAX_OFFSET) { bounce_dir = BOUNCY_BRICK_SPEED; @@ -122,7 +123,7 @@ Block::start_bounce() //--------------------------------------------------------------------------- BonusBlock::BonusBlock(const Vector& pos, int data) - : Block(sprite_manager->create("bonusblock")), object(0) + : Block(sprite_manager->create("images/objects/bonus_block/bonusblock.sprite")), object(0) { bbox.set_pos(pos); sprite->set_action("normal"); @@ -133,14 +134,14 @@ BonusBlock::BonusBlock(const Vector& pos, int data) case 4: contents = CONTENT_1UP; break; case 5: contents = CONTENT_ICEGROW; break; default: - std::cerr << "Invalid box contents!\n"; + log_warning << "Invalid box contents" << std::endl; contents = CONTENT_COIN; break; - } + } } BonusBlock::BonusBlock(const lisp::Lisp& lisp) - : Block(sprite_manager->create("bonusblock")) + : Block(sprite_manager->create("images/objects/bonus_block/bonusblock.sprite")) { Vector pos; @@ -168,7 +169,7 @@ BonusBlock::BonusBlock(const lisp::Lisp& lisp) } else if(contentstring == "custom") { contents = CONTENT_CUSTOM; } else { - std::cerr << "Invalid box contents '" << contentstring << "'.\n"; + log_warning << "Invalid box contents '" << contentstring << "'" << std::endl; } } else { if(contents == CONTENT_CUSTOM) { @@ -178,14 +179,14 @@ BonusBlock::BonusBlock(const lisp::Lisp& lisp) throw std::runtime_error( "Only MovingObjects are allowed inside BonusBlocks"); } else { - std::cerr << "Invalid element '" << token << "' in bonusblock.\n"; + log_warning << "Invalid element '" << token << "' in bonusblock" << std::endl; } - } + } } if(contents == CONTENT_CUSTOM && object == 0) throw std::runtime_error("Need to specify content object for custom block"); - + bbox.set_pos(pos); } @@ -200,29 +201,47 @@ BonusBlock::hit(Player& ) try_open(); } +HitResponse +BonusBlock::collision(GameObject& other, const CollisionHit& hit){ + BadGuy* badguy = dynamic_cast (&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() { - if(sprite->get_action_name() == "empty") { + if(sprite->get_action() == "empty") { sound_manager->play("sounds/brick.wav"); return; } - + Sector* sector = Sector::current(); + assert(sector); + assert(sector->player); Player& player = *(sector->player); + Direction direction = (player.get_bbox().get_middle().x > get_bbox().get_middle().x) ? LEFT : RIGHT; + switch(contents) { case CONTENT_COIN: Sector::current()->add_object(new BouncyCoin(get_pos())); - player.get_status()->incCoins(); + player.get_status()->add_coins(1); break; case CONTENT_FIREGROW: if(player.get_status()->bonus == NO_BONUS) { - SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp()); + SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp(direction)); sector->add_object(riser); } else { SpecialRiser* riser = new SpecialRiser( - get_pos(), new Flower(Flower::FIREFLOWER)); + get_pos(), new Flower(FIRE_BONUS)); sector->add_object(riser); } sound_manager->play("sounds/upgrade.wav"); @@ -230,22 +249,22 @@ BonusBlock::try_open() case CONTENT_ICEGROW: if(player.get_status()->bonus == NO_BONUS) { - SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp()); - sector->add_object(riser); + SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp(direction)); + sector->add_object(riser); } else { SpecialRiser* riser = new SpecialRiser( - get_pos(), new Flower(Flower::ICEFLOWER)); + get_pos(), new Flower(ICE_BONUS)); sector->add_object(riser); - } + } sound_manager->play("sounds/upgrade.wav"); break; case CONTENT_STAR: - sector->add_object(new Star(get_pos() + Vector(0, -32))); + sector->add_object(new Star(get_pos() + Vector(0, -32), direction)); break; case CONTENT_1UP: - sector->add_object(new OneUp(get_pos())); + sector->add_object(new OneUp(get_pos(), direction)); break; case CONTENT_CUSTOM: @@ -254,9 +273,6 @@ BonusBlock::try_open() sector->add_object(riser); sound_manager->play("sounds/upgrade.wav"); break; - - //default: - //assert(false); } start_bounce(); @@ -268,7 +284,7 @@ IMPLEMENT_FACTORY(BonusBlock, "bonusblock"); //--------------------------------------------------------------------------- Brick::Brick(const Vector& pos, int data) - : Block(sprite_manager->create("brick")), breakable(false), + : Block(sprite_manager->create("images/objects/bonus_block/brick.sprite")), breakable(false), coin_counter(0) { bbox.set_pos(pos); @@ -281,25 +297,39 @@ Brick::Brick(const Vector& pos, int data) void Brick::hit(Player& ) { - if(sprite->get_action_name() == "empty") + if(sprite->get_action() == "empty") return; - + try_break(true); } +HitResponse +Brick::collision(GameObject& other, const CollisionHit& hit){ + BadGuy* badguy = dynamic_cast (&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) { - if(sprite->get_action_name() == "empty") + if(sprite->get_action() == "empty") return; - + sound_manager->play("sounds/brick.wav"); Sector* sector = Sector::current(); Player& player = *(sector->player); if(coin_counter > 0) { sector->add_object(new BouncyCoin(get_pos())); coin_counter--; - player.get_status()->incCoins(); + player.get_status()->add_coins(1); if(coin_counter == 0) sprite->set_action("empty"); start_bounce(); @@ -325,4 +355,3 @@ Brick::try_break(bool playerhit) } //IMPLEMENT_FACTORY(Brick, "brick"); -