X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Finvisible_block.hpp;h=59b3085e8db9e9df8cf6160e62a2d35082cddd9b;hb=fbbf4e7e6f3f9251826f0c68169d3f04bb67efa8;hp=5607302080806b7752d4ee92757283f86a9809de;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git

diff --git a/src/object/invisible_block.hpp b/src/object/invisible_block.hpp
index 560730208..59b3085e8 100644
--- a/src/object/invisible_block.hpp
+++ b/src/object/invisible_block.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,13 +12,12 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __INVISIBLE_BLOCK_H__
-#define __INVISIBLE_BLOCK_H__
+#ifndef HEADER_SUPERTUX_OBJECT_INVISIBLE_BLOCK_HPP
+#define HEADER_SUPERTUX_OBJECT_INVISIBLE_BLOCK_HPP
 
-#include "block.hpp"
+#include "object/block.hpp"
 
 class InvisibleBlock : public Block
 {
@@ -28,6 +25,7 @@ public:
   InvisibleBlock(const Vector& pos);
 
   virtual void draw(DrawingContext& context);
+  virtual bool collides(GameObject& other, const CollisionHit& hit);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
 
 protected:
@@ -39,3 +37,4 @@ private:
 
 #endif
 
+/* EOF */