X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fspiky.cpp;h=a4007b7c5d649d470647d2f596ed34c3525307a7;hb=7bbb0ef907ebec48718560425a0147b31307f7fd;hp=44bb3766a3d729037fb36c0468800bcb45d87e26;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp
index 44bb3766a..a4007b7c5 100644
--- a/src/badguy/spiky.cpp
+++ b/src/badguy/spiky.cpp
@@ -4,21 +4,21 @@
 
 static const float WALKSPEED = 80;
 
-Spiky::Spiky(LispReader& reader)
+Spiky::Spiky(const lisp::Lisp& reader)
 {
-  reader.read_float("x", start_position.x);
-  reader.read_float("y", start_position.y);
-  bbox.set_size(32, 32);
+  reader.get("x", start_position.x);
+  reader.get("y", start_position.y);
+  bbox.set_size(31.8, 31.8);
   sprite = sprite_manager->create("spiky");
 }
 
 void
-Spiky::write(LispWriter& writer)
+Spiky::write(lisp::Writer& writer)
 {
   writer.start_list("spiky");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("spiky");
 }
@@ -31,7 +31,7 @@ Spiky::activate()
 }
 
 HitResponse
-Spiky::collision_solid(GameObject& other, const CollisionHit& hit)
+Spiky::collision_solid(GameObject& , const CollisionHit& hit)
 {
   if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
     physic.set_velocity_y(0);
@@ -44,3 +44,16 @@ Spiky::collision_solid(GameObject& other, const CollisionHit& hit)
   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")