X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fpoisonivy.hpp;h=3e93c4f58583f1a451ad526462caf9cab7f6b92c;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=783f23254b5810c7d901046b28453234294807ff;hpb=f406067af6cbeb0a638078fe1d386d092583909c;p=supertux.git diff --git a/src/badguy/poisonivy.hpp b/src/badguy/poisonivy.hpp index 783f23254..3e93c4f58 100644 --- a/src/badguy/poisonivy.hpp +++ b/src/badguy/poisonivy.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,26 +12,24 @@ // 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 __POISONIVY_H__ -#define __POISONIVY_H__ +#ifndef HEADER_SUPERTUX_BADGUY_POISONIVY_HPP +#define HEADER_SUPERTUX_BADGUY_POISONIVY_HPP -#include "walking_badguy.hpp" +#include "badguy/walking_badguy.hpp" class PoisonIvy : public WalkingBadguy { public: - PoisonIvy(const lisp::Lisp& reader); + PoisonIvy(const Reader& reader); PoisonIvy(const Vector& pos, Direction d); - void write(lisp::Writer& writer); - virtual PoisonIvy* clone() const { return new PoisonIvy(*this); } - protected: bool collision_squished(GameObject& object); }; #endif + +/* EOF */