X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fsnowball.cpp;h=2876357a4eb7adcdfc85583a3934efd8102380e1;hb=4a486d92343d1824b311c234e9321e08f280fe68;hp=357c15200900197cb91b220358ec6d4b0fdd069d;hpb=ff3f2e3e93b2af69c0f686f8f636ba0d66c67f73;p=supertux.git

diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp
index 357c15200..2876357a4 100644
--- a/src/badguy/snowball.cpp
+++ b/src/badguy/snowball.cpp
@@ -21,71 +21,26 @@
 
 #include "snowball.hpp"
 
-static const float WALKSPEED = 80;
-
 SnowBall::SnowBall(const lisp::Lisp& reader)
+    : WalkingBadguy(reader, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
-  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;
+  walk_speed = 80;
 }
 
-SnowBall::SnowBall(float pos_x, float pos_y, Direction d, bool stay_on_plat = false)
+SnowBall::SnowBall(const Vector& pos, Direction d)
+    : WalkingBadguy(pos, d, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
-  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;
+  walk_speed = 80;
 }
 
 void
 SnowBall::write(lisp::Writer& writer)
 {
   writer.start_list("snowball");
-
-  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);
-
+  WalkingBadguy::write(writer);
   writer.end_list("snowball");
 }
 
-void
-SnowBall::activate()
-{
-  if (set_direction) {dir = initial_direction;}
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  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)
 {
@@ -94,30 +49,4 @@ SnowBall::collision_squished(Player& player)
   return true;
 }
 
-HitResponse
-SnowBall::collision_solid(GameObject& , 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());
-  }
-
-  return CONTINUE;
-}
-
-HitResponse
-SnowBall::collision_badguy(BadGuy& , const CollisionHit& hit)
-{
-  if(fabsf(hit.normal.x) > .8) { // left or right hit
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());       
-  }
-
-  return CONTINUE;
-}
-
 IMPLEMENT_FACTORY(SnowBall, "snowball")