X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Finvisible_block.hpp;h=85fbb4b415483aec632f306fd88db3ac31a34737;hb=1dfbd27a41341f26775ca4e2b9ca4864f5744a6f;hp=4a56956168f977034e1cf5653ccf64746f6c1fdf;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git diff --git a/src/object/invisible_block.hpp b/src/object/invisible_block.hpp index 4a5695616..85fbb4b41 100644 --- a/src/object/invisible_block.hpp +++ b/src/object/invisible_block.hpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2005 Matthias Braun +// 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 @@ -12,11 +12,10 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // 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. +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef __INVISIBLE_BLOCK_H__ #define __INVISIBLE_BLOCK_H__ @@ -29,6 +28,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,4 +39,3 @@ private: }; #endif -