Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / badguy / spiky.cpp

diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp
index 718cb77..e0e060b 100644 (file)
--- a/src/badguy/spiky.cpp
+++ b/src/badguy/spiky.cpp
@@ -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,33 +12,21 @@
 //  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.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "spiky.hpp"
+#include "badguy/spiky.hpp"
 
-#include "lisp/writer.hpp"
-#include "object_factory.hpp"
 #include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
 
-Spiky::Spiky(const lisp::Lisp& reader)
-        : WalkingBadguy(reader, "images/creatures/spiky/spiky.sprite", "left", "right")
+Spiky::Spiky(const Reader& reader)
+  : WalkingBadguy(reader, "images/creatures/spiky/spiky.sprite", "left", "right")
 {
   walk_speed = 80;
   max_drop_height = 600;
 }
 
 void
-Spiky::write(lisp::Writer& writer)
-{
-  writer.start_list("spiky");
-  WalkingBadguy::write(writer);
-  writer.end_list("spiky");
-}
-
-void
 Spiky::freeze()
 {
   WalkingBadguy::freeze();
@@ -53,4 +39,6 @@ Spiky::is_freezable() const
   return true;
 }
 
-IMPLEMENT_FACTORY(Spiky, "spiky")
+IMPLEMENT_FACTORY(Spiky, "spiky");
+
+/* EOF */