more svn:eol-style = native and header fixes

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

diff --git a/src/object/magicblock.hpp b/src/object/magicblock.hpp
index 3509e73..43b0a18 100644 (file)
--- a/src/object/magicblock.hpp
+++ b/src/object/magicblock.hpp
@@ -24,8 +24,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef SUPERTUX_TRAMPOLINE_H
-#define SUPERTUX_TRAMPOLINE_H
+#ifndef SUPERTUX_MAGICBLOCK_H
+#define SUPERTUX_MAGICBLOCK_H
 
 #include "moving_sprite.hpp"
 #include "lisp/lisp.hpp"
@@ -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);