X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fspiky.cpp;h=3e4297fbf859e6b568bfaaf35820f85d9efdb29e;hb=e2dd0a205bd07716ce8cfa0625fe6a5f20d8917a;hp=fbe27eee8ee65e88acebfc0b4e26b87144d15749;hpb=78e9b27b7059c9b9b16a7f871ab71f751ec75323;p=supertux.git

diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp
index fbe27eee8..3e4297fbf 100644
--- 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,75 +12,31 @@
 //  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>
-
-#include "spiky.hpp"
-
-static const float WALKSPEED = 80;
-
-Spiky::Spiky(const lisp::Lisp& reader)
-	: BadGuy(reader, "images/creatures/spiky/spiky.sprite")
-{
-}
-
-void
-Spiky::write(lisp::Writer& writer)
-{
-  writer.start_list("spiky");
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
+#include "badguy/spiky.hpp"
 
-  writer.end_list("spiky");
-}
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
 
-void
-Spiky::activate()
+Spiky::Spiky(const Reader& reader)
+  : WalkingBadguy(reader, "images/creatures/spiky/spiky.sprite", "left", "right")
 {
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
+  walk_speed = 80;
+  max_drop_height = 600;
 }
 
 void
-Spiky::active_update(float elapsed_time)
+Spiky::freeze()
 {
-  BadGuy::active_update(elapsed_time);
-
-  if (might_fall(601))
-  {
-    dir = (dir == LEFT ? RIGHT : LEFT);
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
+  WalkingBadguy::freeze();
+  sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
 }
 
-HitResponse
-Spiky::collision_solid(GameObject& , const CollisionHit& hit)
+bool
+Spiky::is_freezable() const
 {
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
-    physic.set_velocity_y(0);
-  } else { // hit right or left
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
-
-  return CONTINUE;
-}
-
-HitResponse
-Spiky::collision_badguy(BadGuy& , const CollisionHit& hit)
-{
-  if(fabsf(hit.normal.x) > .8) { // left or right
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
-
-  return CONTINUE;
+  return true;
 }
 
-IMPLEMENT_FACTORY(Spiky, "spiky")
+/* EOF */