X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fspiky.cpp;h=d27cdfa34bb38e350be9f5aa3032e1e2f78ba170;hb=13c84268f16872f9b442251c4175a3a1a7a7899a;hp=8aceaae30f8c44328a7846254d4758236c6d4bbb;hpb=4c9b57d29e67f9db5605f378549b07f670baa837;p=supertux.git

diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp
index 8aceaae30..d27cdfa34 100644
--- a/src/badguy/spiky.cpp
+++ b/src/badguy/spiky.cpp
@@ -21,71 +21,32 @@
 
 #include "spiky.hpp"
 
-static const float WALKSPEED = 80;
-
 Spiky::Spiky(const lisp::Lisp& reader)
+        : WalkingBadguy(reader, "images/creatures/spiky/spiky.sprite", "left", "right")
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/spiky/spiky.sprite");
+  walk_speed = 80;
+  max_drop_height = 600;
 }
 
 void
 Spiky::write(lisp::Writer& writer)
 {
   writer.start_list("spiky");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
+  WalkingBadguy::write(writer);
   writer.end_list("spiky");
 }
 
 void
-Spiky::activate()
+Spiky::freeze()
 {
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
+  WalkingBadguy::freeze();
+  sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
 }
 
-void
-Spiky::active_update(float elapsed_time)
+bool
+Spiky::is_freezable() const
 {
-  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());
-  }
-}
-
-HitResponse
-Spiky::collision_solid(GameObject& , const CollisionHit& hit)
-{
-  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")