X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fblock.cpp;h=3d5d8873bbf3762808ce75e062f9f3c269a47cc1;hb=788a9153f60fb3d25a52fd184387ebbde7636719;hp=ac5bc577c52c8bd73c2d2ba51020b848b9f3e07d;hpb=d62647592b4ccffa89794af6fa03faaced46999d;p=supertux.git diff --git a/src/object/block.cpp b/src/object/block.cpp index ac5bc577c..3d5d8873b 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,47 +12,52 @@ // 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 -#include "resources.hpp" +#include "audio/sound_manager.hpp" +#include "badguy/badguy.hpp" +#include "constants.hpp" +#include "coin.hpp" +#include "flower.hpp" +#include "gameobjs.hpp" +#include "growup.hpp" +#include "level.hpp" +#include "lisp/lisp.hpp" +#include "lisp/list_iterator.hpp" +#include "moving_object.hpp" +#include "object_factory.hpp" +#include "oneup.hpp" #include "player.hpp" +#include "portable.hpp" #include "sector.hpp" +#include "specialriser.hpp" #include "sprite/sprite.hpp" #include "sprite/sprite_manager.hpp" -#include "video/drawing_context.hpp" -#include "lisp/lisp.hpp" -#include "gameobjs.hpp" -#include "specialriser.hpp" -#include "growup.hpp" -#include "flower.hpp" -#include "oneup.hpp" #include "star.hpp" -#include "player_status.hpp" -#include "badguy/badguy.hpp" -#include "coin.hpp" -#include "object_factory.hpp" -#include "lisp/list_iterator.hpp" -#include "object_factory.hpp" -static const float BOUNCY_BRICK_MAX_OFFSET=8; -static const float BOUNCY_BRICK_SPEED=90; -static const float EPSILON = .0001; +static const float BOUNCY_BRICK_MAX_OFFSET = 8; +static const float BOUNCY_BRICK_SPEED = 90; +static const float EPSILON = .0001f; +static const float BUMP_ROTATION_ANGLE = 10; Block::Block(Sprite* newsprite) - : sprite(newsprite), bouncing(false), bounce_dir(0), bounce_offset(0) + : sprite(newsprite), bouncing(false), breaking(false), bounce_dir(0), bounce_offset(0), original_y(-1) { - bbox.set_size(32, 32.1); + bbox.set_size(32, 32.1f); set_group(COLGROUP_STATIC); - flags |= FLAG_SOLID; + sound_manager->preload("sounds/upgrade.wav"); + sound_manager->preload("sounds/brick.wav"); } Block::~Block() @@ -61,28 +66,46 @@ 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() - SHIFT_DELTA) { hit(*player); } } - if(bouncing) { + // only interact with other objects if... + // 1) we are bouncing + // 2) the object is not portable (either never or not currently) + // 3) the object is being hit from below (baguys don't get killed for activating boxes) + Portable* portable = dynamic_cast (&other); + MovingObject* moving_object = dynamic_cast (&other); + bool is_portable = ((portable != 0) && portable->is_portable()); + bool hit_mo_from_below = ((moving_object == 0) || (moving_object->get_bbox().get_bottom() < (get_bbox().get_top() + SHIFT_DELTA))); + if(bouncing && !is_portable && hit_mo_from_below) { + + // Badguys get killed BadGuy* badguy = dynamic_cast (&other); if(badguy) { badguy->kill_fall(); } + + // Coins get collected Coin* coin = dynamic_cast (&other); if(coin) { coin->collect(); } + + //Eggs get jumped + GrowUp* growup = dynamic_cast (&other); + if(growup) { + growup->do_jump(); + } + } - return FORCE_MOVE; + return SOLID; } void @@ -90,15 +113,19 @@ 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; movement = Vector(0, bounce_dir * elapsed_time); + if(breaking){ + break_me(); + } } else if(offset < BOUNCY_BRICK_SPEED * elapsed_time && bounce_dir > 0) { movement = Vector(0, offset); bounce_dir = 0; bouncing = false; + sprite->set_angle(0); } else { movement = Vector(0, bounce_dir * elapsed_time); } @@ -111,18 +138,34 @@ Block::draw(DrawingContext& context) } void -Block::start_bounce() +Block::start_bounce(GameObject* hitter) { - original_y = bbox.p1.y; + if(original_y == -1){ + original_y = bbox.p1.y; + } bouncing = true; bounce_dir = -BOUNCY_BRICK_SPEED; bounce_offset = 0; + + MovingObject* hitter_mo = dynamic_cast(hitter); + if (hitter_mo) { + float center_of_hitter = hitter_mo->get_bbox().get_middle().x; + float offset = (get_bbox().get_middle().x - center_of_hitter)*2 / get_bbox().get_width(); + sprite->set_angle(BUMP_ROTATION_ANGLE*offset); + } +} + +void +Block::start_break(GameObject* hitter) +{ + start_bounce(hitter); + breaking = true; } //--------------------------------------------------------------------------- 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 +176,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 +211,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 +221,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 +243,55 @@ 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 + // SHIFT_DELTA is required to slide over one tile gaps. + if( badguy->can_break() && ( badguy->get_bbox().get_bottom() > get_bbox().get_top() + SHIFT_DELTA) ){ + try_open(); + } + } + Portable* portable = dynamic_cast (&other); + if(portable) { + MovingObject* moving = dynamic_cast (&other); + if(moving->get_bbox().get_top() > get_bbox().get_bottom() - SHIFT_DELTA) { + 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(); + Sector::current()->add_object(new BouncyCoin(get_pos(), true)); + player.get_status()->add_coins(1); + Sector::current()->get_level()->stats.coins++; 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 +299,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,21 +323,36 @@ BonusBlock::try_open() sector->add_object(riser); sound_manager->play("sounds/upgrade.wav"); break; - - //default: - //assert(false); } - start_bounce(); + start_bounce(&player); sprite->set_action("empty"); } +void +Block::break_me() +{ + Sector* sector = Sector::current(); + sector->add_object( + new BrokenBrick(new Sprite(*sprite), get_pos(), Vector(-100, -400))); + sector->add_object( + new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(0, 16), + Vector(-150, -300))); + sector->add_object( + new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(16, 0), + Vector(100, -400))); + sector->add_object( + new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(16, 16), + Vector(150, -300))); + remove_me(); +} + 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); @@ -279,50 +363,69 @@ Brick::Brick(const Vector& pos, int data) } void -Brick::hit(Player& ) +Brick::hit(Player& player) { - if(sprite->get_action_name() == "empty") + if(sprite->get_action() == "empty") return; - - try_break(true); + + try_break(&player); +} + +HitResponse +Brick::collision(GameObject& other, const CollisionHit& hit){ + + Player* player = dynamic_cast (&other); + if (player) { + if (player->does_buttjump) try_break(); + } + + 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 + // SHIFT_DELTA is required to slide over one tile gaps. + if( badguy->can_break() && ( badguy->get_bbox().get_bottom() > get_bbox().get_top() + SHIFT_DELTA ) ){ + try_break(); + } + } + Portable* portable = dynamic_cast (&other); + if(portable) { + MovingObject* moving = dynamic_cast (&other); + if(moving->get_bbox().get_top() > get_bbox().get_bottom() - SHIFT_DELTA) { + try_break(); + } + } + return Block::collision(other, hit); } void -Brick::try_break(bool playerhit) +Brick::try_break(Player* player) { - 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); + Player& player_one = *(sector->player); if(coin_counter > 0) { - sector->add_object(new BouncyCoin(get_pos())); + sector->add_object(new BouncyCoin(get_pos(),true)); coin_counter--; - player.get_status()->incCoins(); + player_one.get_status()->add_coins(1); if(coin_counter == 0) sprite->set_action("empty"); - start_bounce(); + start_bounce(player); } else if(breakable) { - if(playerhit && !player.is_big()) { - start_bounce(); - return; + if(player){ + if(player->is_big()){ + start_break(player); + return; + } else { + start_bounce(player); + return; + } } - - sector->add_object( - new BrokenBrick(new Sprite(*sprite), get_pos(), Vector(-100, -400))); - sector->add_object( - new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(0, 16), - Vector(-150, -300))); - sector->add_object( - new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(16, 0), - Vector(100, -400))); - sector->add_object( - new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(16, 16), - Vector(150, -300))); - remove_me(); + break_me(); } } //IMPLEMENT_FACTORY(Brick, "brick"); -