X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Figel.hpp;h=c63d76675448942b77182e7be2d98045b5085b77;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=4d2b82f793c128d655ad40a065ed26372aeb7414;hpb=f406067af6cbeb0a638078fe1d386d092583909c;p=supertux.git diff --git a/src/badguy/igel.hpp b/src/badguy/igel.hpp index 4d2b82f79..c63d76675 100644 --- a/src/badguy/igel.hpp +++ b/src/badguy/igel.hpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux - Badguy "Igel" // Copyright (C) 2006 Christoph Sommer // -// 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,14 +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 __IGEL_H__ -#define __IGEL_H__ +#ifndef HEADER_SUPERTUX_BADGUY_IGEL_HPP +#define HEADER_SUPERTUX_BADGUY_IGEL_HPP -#include "walking_badguy.hpp" -#include "moving_object.hpp" +#include "badguy/walking_badguy.hpp" /** * Badguy "Igel" - a hedgehog that can absorb bullets @@ -29,16 +25,13 @@ class Igel : public WalkingBadguy { public: - Igel(const lisp::Lisp& reader); + Igel(const Reader& reader); Igel(const Vector& pos, Direction d); - void write(lisp::Writer& writer); HitResponse collision_bullet(Bullet& bullet, const CollisionHit& hit); void active_update(float elapsed_time); - virtual Igel* clone() const { return new Igel(*this); } - protected: bool collision_squished(GameObject& object); void be_normal(); /**< switch to state STATE_NORMAL */ @@ -51,3 +44,5 @@ private: }; #endif + +/* EOF */