#include "audio/sound_manager.hpp"
#include "object_factory.hpp"
#include "object/player.hpp"
+#include "constants.hpp"
InvisibleBlock::InvisibleBlock(const Vector& pos)
: Block(sprite_manager->create("images/objects/bonus_block/invisibleblock.sprite")), visible(false)
{
bbox.set_pos(pos);
sound_manager->preload("sounds/brick.wav");
- sound_manager->preload("sounds/brick.wav");
}
void
sprite->draw(context, get_pos(), LAYER_OBJECTS);
}
-HitResponse
-InvisibleBlock::collision(GameObject& other, const CollisionHit& hit)
+bool
+InvisibleBlock::collides(GameObject& other, const CollisionHit& )
{
- if (visible) return Block::collision(other, hit);
+ if(visible)
+ return true;
// if we're not visible, only register a collision if this will make us visible
Player* player = dynamic_cast<Player*> (&other);
if ((player)
&& (player->get_movement().y <= 0)
- && (player->get_bbox().get_top() > get_bbox().get_bottom() - 7.0)) {
- return Block::collision(other, hit);
+ && (player->get_bbox().get_top() > get_bbox().get_bottom() - SHIFT_DELTA)) {
+ return true;
}
- return PASSTHROUGH;
+ return false;
+}
+
+HitResponse
+InvisibleBlock::collision(GameObject& other, const CollisionHit& hit)
+{
+ return Block::collision(other, hit);
}
void
-InvisibleBlock::hit(Player& )
+InvisibleBlock::hit(Player& player)
{
sound_manager->play("sounds/brick.wav");
return;
sprite->set_action("empty");
- start_bounce();
+ start_bounce(&player);
set_group(COLGROUP_STATIC);
visible = true;
}