Don't die when main icon cannot be loaded

[supertux.git] / src / object / magicblock.hpp

diff --git a/src/object/magicblock.hpp b/src/object/magicblock.hpp
index fcb15f6..64d9add 100644 (file)
--- a/src/object/magicblock.hpp
+++ b/src/object/magicblock.hpp
@@ -1,8 +1,8 @@
 //  $Id$
 //
 //  SuperTux - MagicBlock
-// 
-//  Magic Blocks are tile-like game objects that are sensitive to 
+//
+//  Magic Blocks are tile-like game objects that are sensitive to
 //  lighting conditions. They are rendered in a color and
 //  will only be solid as long as light of the same color shines
 //  on the block. The black block becomes solid, if any kind of
@@ -35,6 +35,7 @@ class MagicBlock: public MovingSprite
 public:
   MagicBlock(const lisp::Lisp& reader);
 
+  bool collides(GameObject& other, const CollisionHit& hit);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
   void update(float elapsed_time);
   void draw(DrawingContext& context);