X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fspiky.cpp;h=f2b42ac8cfebe6532ef246c14e4f53b6fcd54606;hb=ff59adfe9b44e1447ae02a2f9705d695a280059e;hp=7dbe450d5f20cac86b251eb399abdd15713ba4db;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp
index 7dbe450d5..f2b42ac8c 100644
--- a/src/badguy/spiky.cpp
+++ b/src/badguy/spiky.cpp
@@ -21,58 +21,19 @@
 
 #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()
-{
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
-}
-
-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;
-}
-
 IMPLEMENT_FACTORY(Spiky, "spiky")