X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fblock.cpp;h=1e242710f3bad23eb891813f74c8cd61ae6ee667;hb=590d47c3c3cf4641d97ee1579af69edbc355e5a8;hp=f5ba2d8766d048f1ed6d6f83746976e1be211388;hpb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;p=supertux.git diff --git a/src/object/block.cpp b/src/object/block.cpp index f5ba2d876..1e242710f 100644 --- a/src/object/block.cpp +++ b/src/object/block.cpp @@ -18,21 +18,13 @@ #include "audio/sound_manager.hpp" #include "badguy/badguy.hpp" -#include "lisp/list_iterator.hpp" #include "object/broken_brick.hpp" #include "object/coin.hpp" #include "object/flower.hpp" -#include "object/bouncy_coin.hpp" #include "object/growup.hpp" -#include "object/oneup.hpp" #include "object/player.hpp" #include "object/portable.hpp" -#include "object/specialriser.hpp" -#include "object/star.hpp" -#include "sprite/sprite_manager.hpp" #include "supertux/constants.hpp" -#include "supertux/level.hpp" -#include "supertux/object_factory.hpp" #include "supertux/sector.hpp" static const float BOUNCY_BRICK_MAX_OFFSET = 8; @@ -40,18 +32,18 @@ static const float BOUNCY_BRICK_SPEED = 90; static const float EPSILON = .0001f; static const float BUMP_ROTATION_ANGLE = 10; -Block::Block(std::auto_ptr newsprite) : - sprite(newsprite), - bouncing(false), - breaking(false), - bounce_dir(0), - bounce_offset(0), +Block::Block(SpritePtr newsprite) : + sprite(newsprite), + bouncing(false), + breaking(false), + bounce_dir(0), + bounce_offset(0), original_y(-1) { bbox.set_size(32, 32.1f); set_group(COLGROUP_STATIC); - sound_manager->preload("sounds/upgrade.wav"); - sound_manager->preload("sounds/brick.wav"); + SoundManager::current()->preload("sounds/upgrade.wav"); + SoundManager::current()->preload("sounds/brick.wav"); } Block::~Block() @@ -89,7 +81,7 @@ Block::collision(GameObject& other, const CollisionHit& ) if(coin) { coin->collect(); } - + //Eggs get jumped GrowUp* growup = dynamic_cast (&other); if(growup) { @@ -98,7 +90,7 @@ Block::collision(GameObject& other, const CollisionHit& ) } - return SOLID; + return FORCE_MOVE; } void @@ -155,279 +147,22 @@ Block::start_break(GameObject* hitter) breaking = true; } -//--------------------------------------------------------------------------- - -BonusBlock::BonusBlock(const Vector& pos, int data) : - Block(sprite_manager->create("images/objects/bonus_block/bonusblock.sprite")), - object(0) -{ - bbox.set_pos(pos); - sprite->set_action("normal"); - switch(data) { - case 1: contents = CONTENT_COIN; break; - case 2: contents = CONTENT_FIREGROW; break; - case 3: contents = CONTENT_STAR; break; - case 4: contents = CONTENT_1UP; break; - case 5: contents = CONTENT_ICEGROW; break; - default: - log_warning << "Invalid box contents" << std::endl; - contents = CONTENT_COIN; - break; - } -} - -BonusBlock::BonusBlock(const Reader& lisp) : - Block(sprite_manager->create("images/objects/bonus_block/bonusblock.sprite")) -{ - Vector pos; - - contents = CONTENT_COIN; - 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 { - 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 -BonusBlock::hit(Player& ) -{ - try_open(); -} - -HitResponse -BonusBlock::collision(GameObject& other, const CollisionHit& hit){ - - Player* player = dynamic_cast (&other); - if (player) { - if (player->does_buttjump) try_open(); - } - - 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 block - // 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() == "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(), 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(direction)); - sector->add_object(riser); - } else { - SpecialRiser* riser = new SpecialRiser( - get_pos(), new Flower(FIRE_BONUS)); - sector->add_object(riser); - } - sound_manager->play("sounds/upgrade.wav"); - break; - - case CONTENT_ICEGROW: - if(player.get_status()->bonus == NO_BONUS) { - SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp(direction)); - sector->add_object(riser); - } else { - SpecialRiser* riser = new SpecialRiser( - 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), direction)); - break; - - case CONTENT_1UP: - sector->add_object(new OneUp(get_pos(), direction)); - break; - - 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(&player); - sprite->set_action("empty"); -} - void Block::break_me() { Sector* sector = Sector::current(); sector->add_object( - new BrokenBrick(std::auto_ptr(new Sprite(*sprite)), get_pos(), Vector(-100, -400))); + new BrokenBrick(sprite->clone(), get_pos(), Vector(-100, -400))); sector->add_object( - new BrokenBrick(std::auto_ptr(new Sprite(*sprite)), get_pos() + Vector(0, 16), + new BrokenBrick(sprite->clone(), get_pos() + Vector(0, 16), Vector(-150, -300))); sector->add_object( - new BrokenBrick(std::auto_ptr(new Sprite(*sprite)), get_pos() + Vector(16, 0), + new BrokenBrick(sprite->clone(), get_pos() + Vector(16, 0), Vector(100, -400))); sector->add_object( - new BrokenBrick(std::auto_ptr(new Sprite(*sprite)), get_pos() + Vector(16, 16), + new BrokenBrick(sprite->clone(), 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("images/objects/bonus_block/brick.sprite")), breakable(false), - coin_counter(0) -{ - bbox.set_pos(pos); - if(data == 1) - coin_counter = 5; - else - breakable = true; -} - -void -Brick::hit(Player& player) -{ - if(sprite->get_action() == "empty") - return; - - 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(Player* player) -{ - if(sprite->get_action() == "empty") - return; - - sound_manager->play("sounds/brick.wav"); - Sector* sector = Sector::current(); - Player& player_one = *(sector->player); - if(coin_counter > 0) { - sector->add_object(new BouncyCoin(get_pos(),true)); - coin_counter--; - player_one.get_status()->add_coins(1); - if(coin_counter == 0) - sprite->set_action("empty"); - start_bounce(player); - } else if(breakable) { - if(player){ - if(player->is_big()){ - start_break(player); - return; - } else { - start_bounce(player); - return; - } - } - break_me(); - } -} - -//IMPLEMENT_FACTORY(Brick, "brick"); - /* EOF */