Fixed MrTree. He uses activate() to change direction which is now working again.

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

diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp
index 357c152..22dce8e 100644 (file)
--- a/src/badguy/snowball.cpp
+++ b/src/badguy/snowball.cpp
@@ -24,27 +24,19 @@
 static const float WALKSPEED = 80;
 
 SnowBall::SnowBall(const lisp::Lisp& reader)
+       : BadGuy(reader, "images/creatures/snowball/snowball.sprite")
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  //This is for a hidden badguy :)
-  fluffy = false;  
-  reader.get("fluffy",fluffy);
-  stay_on_platform = false;
-  reader.get("stay-on-platform", stay_on_platform);
-  bbox.set_size(31.8, 31.8);
-  if (fluffy) sprite = sprite_manager->create("images/creatures/fluffy/fluffy.sprite");
-  else sprite = sprite_manager->create("images/creatures/snowball/snowball.sprite");
   set_direction = false;
+  reader.get("direction", direction);
+  if( direction != "auto" && direction != ""){
+    set_direction = true;
+    initial_direction = str2dir( direction );
+  }
 }
 
-SnowBall::SnowBall(float pos_x, float pos_y, Direction d, bool stay_on_plat = false)
+SnowBall::SnowBall(const Vector& pos, Direction d)
+       : BadGuy(pos, "images/creatures/snowball/snowball.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/snowball/snowball.sprite");
   set_direction = true;
   initial_direction = d;
 }
@@ -54,16 +46,14 @@ SnowBall::write(lisp::Writer& writer)
 {
   writer.start_list("snowball");
 
+  writer.write_string("direction", direction);
   writer.write_float("x", start_position.x);
   writer.write_float("y", start_position.y);
-
+  /*
   if (fluffy) {  // don't give us away at every snowball
     writer.write_bool("fluffy", true);
   }
-
-  if (stay_on_platform)
-    writer.write_bool("stay-on-platform", true);
-
+  */
   writer.end_list("snowball");
 }
 
@@ -75,17 +65,6 @@ SnowBall::activate()
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
 
-void
-SnowBall::active_update(float elapsed_time)
-{
-  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
 SnowBall::collision_squished(Player& player)
 {