X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Finvisible_block.hpp;h=59b3085e8db9e9df8cf6160e62a2d35082cddd9b;hb=HEAD;hp=bada73ce20a75c8b8f9809e784fcd7c5e805e659;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/object/invisible_block.hpp b/src/object/invisible_block.hpp index bada73ce2..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 // -// 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 . -#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,8 @@ 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: virtual void hit(Player& player); @@ -38,3 +37,4 @@ private: #endif +/* EOF */