#include "object_factory.hpp"
#include "lisp/list_iterator.hpp"
#include "object_factory.hpp"
+#include "level.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;
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)
{
- 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()
}
HitResponse
-Block::collision(GameObject& other, const CollisionHit& hitdata)
+Block::collision(GameObject& other, const CollisionHit& )
{
Player* player = dynamic_cast<Player*> (&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);
}
}
}
}
- return FORCE_MOVE;
+ return SOLID;
}
void
{
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;
bounce_offset = 0;
}
+void
+Block::start_break()
+{
+ start_bounce();
+ breaking = true;
+}
+
//---------------------------------------------------------------------------
BonusBlock::BonusBlock(const Vector& pos, int data)
log_warning << "Invalid box contents" << std::endl;
contents = CONTENT_COIN;
break;
- }
+ }
}
BonusBlock::BonusBlock(const lisp::Lisp& lisp)
} 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);
}
try_open();
}
+HitResponse
+BonusBlock::collision(GameObject& other, const CollisionHit& hit){
+ BadGuy* badguy = dynamic_cast<BadGuy*> (&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()
{
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()->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");
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:
sector->add_object(riser);
sound_manager->play("sounds/upgrade.wav");
break;
-
- //default:
- //assert(false);
}
start_bounce();
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");
//---------------------------------------------------------------------------
{
if(sprite->get_action() == "empty")
return;
-
+
try_break(true);
}
+HitResponse
+Brick::collision(GameObject& other, const CollisionHit& hit){
+ BadGuy* badguy = dynamic_cast<BadGuy*> (&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() == "empty")
return;
-
+
sound_manager->play("sounds/brick.wav");
Sector* sector = Sector::current();
Player& player = *(sector->player);
sprite->set_action("empty");
start_bounce();
} else if(breakable) {
- if(playerhit && !player.is_big()) {
- start_bounce();
- return;
+ if(playerhit){
+ if(player.is_big()){
+ start_break();
+ return;
+ } else {
+ start_bounce();
+ 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");
-
projects / supertux.git / blobdiff