X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fmagicblock.cpp;h=99135de94b0623324e634d3372c8cd5295a66659;hb=555d1b7bebb45326d82d934e07463209837309b0;hp=9d0caf8b033b481d93e512d42380cbeb3764024e;hpb=a983f6648d43492632c41e2b7519b70458b53cf4;p=supertux.git

diff --git a/src/object/magicblock.cpp b/src/object/magicblock.cpp
index 9d0caf8b0..99135de94 100644
--- a/src/object/magicblock.cpp
+++ b/src/object/magicblock.cpp
@@ -42,7 +42,7 @@ namespace {
 }
 
 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);
@@ -144,14 +144,16 @@ MagicBlock::draw(DrawingContext& context){
   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");