Support for initial direction "left"|"right"|"auto" in Dispenser,

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

diff --git a/src/badguy/poisonivy.cpp b/src/badguy/poisonivy.cpp
index cd8e16b..302fb4c 100644 (file)
--- a/src/badguy/poisonivy.cpp
+++ b/src/badguy/poisonivy.cpp
@@ -24,23 +24,19 @@
 static const float WALKSPEED = 80;
 
 PoisonIvy::PoisonIvy(const lisp::Lisp& reader)
+       : BadGuy(reader, "images/creatures/poison_ivy/poison_ivy.sprite")
 {
-  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/poison_ivy/poison_ivy.sprite");
   set_direction = false;
+  reader.get("direction", direction);
+  if( direction != "auto" && direction != ""){
+    set_direction = true;
+    initial_direction = str2dir( direction );
+  }
 }
 
-PoisonIvy::PoisonIvy(float pos_x, float pos_y, Direction d, bool stay_on_plat = false)
+PoisonIvy::PoisonIvy(const Vector& pos, Direction d)
+       : BadGuy(pos, "images/creatures/poison_ivy/poison_ivy.sprite")
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  stay_on_platform = stay_on_plat;
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/poison_ivy/poison_ivy.sprite");
   set_direction = true;
   initial_direction = d;
 }
@@ -50,9 +46,9 @@ PoisonIvy::write(lisp::Writer& writer)
 {
   writer.start_list("poisonivy");
 
+  writer.write_string("direction", direction);
   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("poisonivy");
 }
@@ -65,17 +61,6 @@ PoisonIvy::activate()
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
 
-void
-PoisonIvy::active_update(float )
-{
-  if (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());
-  }
-}
-
 bool
 PoisonIvy::collision_squished(Player& player)
 {