Updating cherrybomb, adding juicebox (blue bomb).

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

diff --git a/src/badguy/sspiky.cpp b/src/badguy/sspiky.cpp
index 779c6ff..3379c0b 100644 (file)
--- a/src/badguy/sspiky.cpp
+++ b/src/badguy/sspiky.cpp
@@ -25,14 +25,8 @@ 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)
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  stay_on_platform = false;
-  reader.get("stay-on-platform", stay_on_platform);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/spiky/sleepingspiky.sprite");
-  state = SSPIKY_SLEEPING;
 }
 
 void
@@ -42,7 +36,6 @@ SSpiky::write(lisp::Writer& writer)
 
   writer.write_float("x", start_position.x);
   writer.write_float("y", start_position.y);
-  if (stay_on_platform) writer.write_bool("stay-on-platform", true);
 
   writer.end_list("sspiky");
 }
@@ -50,9 +43,6 @@ SSpiky::write(lisp::Writer& writer)
 void
 SSpiky::activate()
 {
-  //FIXME: turns sspiky around for debugging
-  dir = dir == LEFT ? RIGHT : LEFT;
-
   state = SSPIKY_SLEEPING;
   physic.set_velocity_x(0);
   sprite->set_action(dir == LEFT ? "sleeping-left" : "sleeping-right");
@@ -121,13 +111,6 @@ SSpiky::active_update(float elapsed_time) {
       state = SSPIKY_WALKING;
     }
   }
-
-  if (state == SSPIKY_WALKING && stay_on_platform && may_fall_off_platform())
-  {
-    dir = (dir == LEFT ? RIGHT : LEFT);
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
 }
 
 IMPLEMENT_FACTORY(SSpiky, "sspiky")