* Use overloading in Lisp and Writer

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

diff --git a/src/badguy/sspiky.cpp b/src/badguy/sspiky.cpp
index 3827ae2..3980b9c 100644 (file)
--- a/src/badguy/sspiky.cpp
+++ b/src/badguy/sspiky.cpp
@@ -22,65 +22,56 @@
 #include "sspiky.hpp"
 
 static const float WALKSPEED = 80;
-static const float WAKE_TIME = .5;
 
 SSpiky::SSpiky(const lisp::Lisp& reader)
-       : BadGuy(reader, "images/creatures/spiky/sleepingspiky.sprite"), state(SSPIKY_SLEEPING)
+        : WalkingBadguy(reader, "images/creatures/spiky/sleepingspiky.sprite", "left", "right"), state(SSPIKY_SLEEPING)
 {
+  walk_speed = WALKSPEED;
+  max_drop_height = -1;
 }
 
 void
 SSpiky::write(lisp::Writer& writer)
 {
   writer.start_list("sspiky");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
+  WalkingBadguy::write(writer);
   writer.end_list("sspiky");
 }
 
 void
-SSpiky::activate()
+SSpiky::initialize()
 {
   state = SSPIKY_SLEEPING;
   physic.set_velocity_x(0);
   sprite->set_action(dir == LEFT ? "sleeping-left" : "sleeping-right");
 }
 
-
-
-HitResponse
-SSpiky::collision_solid(GameObject& , const CollisionHit& hit)
+void
+SSpiky::collision_solid(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());
+  if(state != SSPIKY_WALKING) {
+    BadGuy::collision_solid(hit);
+    return;
   }
-
-  return CONTINUE;
+  WalkingBadguy::collision_solid(hit);
 }
 
 HitResponse
-SSpiky::collision_badguy(BadGuy& , const CollisionHit& hit)
+SSpiky::collision_badguy(BadGuy& badguy, const CollisionHit& hit)
 {
-  if(state != SSPIKY_WALKING) return CONTINUE;
-
-  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());
+  if(state != SSPIKY_WALKING) {
+    return BadGuy::collision_badguy(badguy, hit);
   }
-
-  return CONTINUE;
+  return WalkingBadguy::collision_badguy(badguy, hit);
 }
 
-void 
+void
 SSpiky::active_update(float elapsed_time) {
-  BadGuy::active_update(elapsed_time);
+
+  if(state == SSPIKY_WALKING) {
+    WalkingBadguy::active_update(elapsed_time);
+    return;
+  }
 
   if(state == SSPIKY_SLEEPING) {
 
@@ -96,21 +87,37 @@ SSpiky::active_update(float elapsed_time) {
 
       if (inReach_left && inReach_right && inReach_top && inReach_bottom) {
         // wake up
-        sprite->set_action(dir == LEFT ? "waking-left" : "waking-right");
-        if(!timer.started()) timer.start(WAKE_TIME);
+        sprite->set_action(dir == LEFT ? "waking-left" : "waking-right", 1);
         state = SSPIKY_WAKING;
       }
     }
+
+    BadGuy::active_update(elapsed_time);
   }
 
   if(state == SSPIKY_WAKING) {
-    if(timer.check()) {
+    if(sprite->animation_done()) {
       // start walking
-      sprite->set_action(dir == LEFT ? "left" : "right");
-      physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
       state = SSPIKY_WALKING;
+      WalkingBadguy::initialize();
     }
+
+    BadGuy::active_update(elapsed_time);
   }
 }
 
+void
+SSpiky::freeze()
+{
+  WalkingBadguy::freeze();
+  sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
+  state = SSPIKY_WALKING; // if we get hit while sleeping, wake up :)
+}
+
+bool
+SSpiky::is_freezable() const
+{
+  return true;
+}
+
 IMPLEMENT_FACTORY(SSpiky, "sspiky")