New sound effects

[supertux.git] / src / badguy / igel.hpp

diff --git a/src/badguy/igel.hpp b/src/badguy/igel.hpp
index a824620..dbade8a 100644 (file)
--- a/src/badguy/igel.hpp
+++ b/src/badguy/igel.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Badguy "Igel"
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.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,47 +12,39 @@
 //  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 __IGEL_H__
-#define __IGEL_H__
+#ifndef HEADER_SUPERTUX_BADGUY_IGEL_HPP
+#define HEADER_SUPERTUX_BADGUY_IGEL_HPP
 
-#include "badguy.hpp"
-#include "moving_object.hpp"
+#include "badguy/walking_badguy.hpp"
 
 /**
  * Badguy "Igel" - a hedgehog that can absorb bullets
  */
-class Igel : public BadGuy
+class Igel : public WalkingBadguy
 {
 public:
-  Igel(const lisp::Lisp& reader);
+  Igel(const Reader& reader);
   Igel(const Vector& pos, Direction d);
 
-  void activate();
-  void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& object, const CollisionHit& hit);
-  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   HitResponse collision_bullet(Bullet& bullet, const CollisionHit& hit);
 
   void active_update(float elapsed_time);
 
-  virtual Igel* clone() const { return new Igel(*this); }
+  bool is_freezable() const;
 
 protected:
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
   void be_normal(); /**< switch to state STATE_NORMAL */
   void turn_around(); /**< reverse direction, assumes we are in STATE_NORMAL */
   bool can_see(const MovingObject& o); /**< check if we can see o */
 
 private:
-  enum State {
-    STATE_NORMAL /**< walking around */
-  };
-  State state;
   Timer turn_recover_timer; /**< wait time until we will turn around again when shot at */
+
 };
 
 #endif
 
+/* EOF */