X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fspiky.hpp;h=e1cd6f53015ff80b8b853ccd5de573014d828701;hb=634111449bef8b030090510475857adde9f3f87e;hp=75d2f5f26fe310448bf81b44d8ffc165f810e4e6;hpb=12966e3f986f7202125ae590c74a4d0c227441dd;p=supertux.git

diff --git a/src/badguy/spiky.hpp b/src/badguy/spiky.hpp
index 75d2f5f26..e1cd6f530 100644
--- a/src/badguy/spiky.hpp
+++ b/src/badguy/spiky.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.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,31 +12,23 @@
 //  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 __SPIKY_H__
-#define __SPIKY_H__
+#ifndef HEADER_SUPERTUX_BADGUY_SPIKY_HPP
+#define HEADER_SUPERTUX_BADGUY_SPIKY_HPP
 
-#include "badguy.hpp"
+#include "badguy/walking_badguy.hpp"
 
-class Spiky : public BadGuy
+class Spiky : public WalkingBadguy
 {
 public:
-  Spiky(const lisp::Lisp& reader);
-
-  void activate();
-  void write(lisp::Writer& writer);
-  void active_update(float elapsed_time);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
-  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
+  Spiky(const Reader& reader);
 
-  virtual Spiky* clone() const { return new Spiky(*this); }
+  bool is_freezable() const;
 
 private:
-  bool set_direction;
-  Direction initial_direction;  
-  std::string direction;
 };
 
 #endif
+
+/* EOF */