}
MagicBlock::MagicBlock(const lisp::Lisp& lisp)
- : MovingSprite(lisp, "images/objects/magicblock/magicblock.sprite"),
+ : MovingSprite(lisp, "images/objects/magicblock/magicblock.sprite"),
is_solid(false), solid_time(0), switch_delay(0), light(1.0f,1.0f,1.0f)
{
set_group(COLGROUP_STATIC);
context.draw_filled_rect( get_bbox(), color, layer);
}
+bool
+MagicBlock::collides(GameObject& /*other*/, const CollisionHit& /*hit*/)
+{
+ return is_solid;
+}
+
HitResponse
MagicBlock::collision(GameObject& /*other*/, const CollisionHit& /*hit*/)
{
- if(is_solid) {
- return SOLID;
- } else {
- return PASSTHROUGH;
- }
+ return SOLID;
}
IMPLEMENT_FACTORY(MagicBlock, "magicblock");