X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fblock.cpp;h=b9fae8393f8e80f026bc8707a41b80ddbdd7a4e2;hb=77d00a6f464cc87c6b50cf1f3b38064a7ae9aead;hp=ae016480b1de859660d04158c1133757a59ba800;hpb=523d415707de9f777729534f467779d4c5acdf6e;p=supertux.git diff --git a/src/object/block.cpp b/src/object/block.cpp index ae016480b..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,32 +12,37 @@ // 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.h" -#include "resources.h" -#include "player.h" -#include "sector.h" -#include "sprite/sprite.h" -#include "sprite/sprite_manager.h" -#include "video/drawing_context.h" -#include "lisp/lisp.h" -#include "gameobjs.h" -#include "specialriser.h" -#include "growup.h" -#include "flower.h" -#include "oneup.h" -#include "star.h" -#include "player_status.h" -#include "badguy/badguy.h" -#include "coin.h" -#include "object_factory.h" +#include "block.hpp" +#include "log.hpp" + +#include + +#include "resources.hpp" +#include "player.hpp" +#include "sector.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; @@ -47,7 +52,9 @@ Block::Block(Sprite* newsprite) : sprite(newsprite), bouncing(false), bounce_dir(0), bounce_offset(0) { bbox.set_size(32, 32.1); - flags |= FLAG_SOLID; + set_group(COLGROUP_STATIC); + sound_manager->preload("sounds/upgrade.wav"); + sound_manager->preload("sounds/brick.wav"); } Block::~Block() @@ -56,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); } } @@ -77,7 +83,7 @@ Block::collision(GameObject& other, const CollisionHit& hitdata) } } - return FORCE_MOVE; + return SOLID; } void @@ -85,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; @@ -117,7 +123,7 @@ Block::start_bounce() //--------------------------------------------------------------------------- BonusBlock::BonusBlock(const Vector& pos, int data) - : Block(sprite_manager->create("bonusblock")) + : Block(sprite_manager->create("images/objects/bonus_block/bonusblock.sprite")), object(0) { bbox.set_pos(pos); sprite->set_action("normal"); @@ -128,37 +134,65 @@ 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; - lisp.get("x", pos.x); - lisp.get("y", pos.y); - bbox.set_pos(pos); - std::string contentstring; contents = CONTENT_COIN; - if(lisp.get("contents", contentstring)) { - if(contentstring == "coin") { - contents = CONTENT_COIN; - } else if(contentstring == "firegrow") { - contents = CONTENT_FIREGROW; - } else if(contentstring == "icegrow") { - contents = CONTENT_ICEGROW; - } else if(contentstring == "star") { - contents = CONTENT_STAR; - } else if(contentstring == "1up") { - contents = CONTENT_1UP; + lisp::ListIterator iter(&lisp); + while(iter.next()) { + const std::string& token = iter.item(); + if(token == "x") { + iter.value()->get(pos.x); + } else if(token == "y") { + iter.value()->get(pos.y); + } else if(token == "contents") { + std::string contentstring; + iter.value()->get(contentstring); + if(contentstring == "coin") { + contents = CONTENT_COIN; + } else if(contentstring == "firegrow") { + contents = CONTENT_FIREGROW; + } else if(contentstring == "icegrow") { + contents = CONTENT_ICEGROW; + } else if(contentstring == "star") { + contents = CONTENT_STAR; + } else if(contentstring == "1up") { + contents = CONTENT_1UP; + } else if(contentstring == "custom") { + contents = CONTENT_CUSTOM; + } else { + log_warning << "Invalid box contents '" << contentstring << "'" << std::endl; + } } else { - std::cerr << "Invalid box contents '" << contentstring << "'.\n"; + if(contents == CONTENT_CUSTOM) { + GameObject* game_object = create_object(token, *(iter.lisp())); + object = dynamic_cast (game_object); + if(object == 0) + throw std::runtime_error( + "Only MovingObjects are allowed inside BonusBlocks"); + } else { + 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); +} + +BonusBlock::~BonusBlock() +{ + delete object; } void @@ -167,70 +201,90 @@ 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") { - sound_manager->play_sound("brick"); + 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( - new GrowUp(get_pos() + Vector(0, -32))); + SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp(direction)); sector->add_object(riser); } else { SpecialRiser* riser = new SpecialRiser( - new Flower(get_pos() + Vector(0, -32), Flower::FIREFLOWER)); + get_pos(), new Flower(FIRE_BONUS)); sector->add_object(riser); } - sound_manager->play_sound("upgrade"); + sound_manager->play("sounds/upgrade.wav"); break; case CONTENT_ICEGROW: if(player.get_status()->bonus == NO_BONUS) { - SpecialRiser* riser = new SpecialRiser( - new GrowUp(get_pos() + Vector(0, -32))); - sector->add_object(riser); + SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp(direction)); + sector->add_object(riser); } else { - SpecialRiser* riser = new SpecialRiser( - new Flower(get_pos() + Vector(0, -32), Flower::ICEFLOWER)); + SpecialRiser* riser = new SpecialRiser( + get_pos(), new Flower(ICE_BONUS)); sector->add_object(riser); - } - sound_manager->play_sound("upgrade"); + } + 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; - default: - assert(false); + case CONTENT_CUSTOM: + SpecialRiser* riser = new SpecialRiser(get_pos(), object); + object = 0; + sector->add_object(riser); + sound_manager->play("sounds/upgrade.wav"); + break; } start_bounce(); sprite->set_action("empty"); } -IMPLEMENT_FACTORY(BonusBlock, "bonusblock") +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); @@ -243,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_sound("brick"); + + 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(); @@ -286,4 +354,4 @@ Brick::try_break(bool playerhit) } } -//IMPLEMENT_FACTORY(Brick, "brick") +//IMPLEMENT_FACTORY(Brick, "brick");