X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fsnowball.cpp;h=8e690cbed3bde509a1fd39dd5e2625090def1ec1;hb=2d1bc69993923150eb701d3cacb917ab4e23d5ef;hp=889578e3e6c594aaa2537efc55f99c3dc3f3da90;hpb=7c2f8e23f9accd00bd9ee2319da8ab8aa341c7cf;p=supertux.git

diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp
index 889578e3e..8e690cbed 100644
--- a/src/badguy/snowball.cpp
+++ b/src/badguy/snowball.cpp
@@ -21,72 +21,32 @@
 
 #include "snowball.hpp"
 
-static const float WALKSPEED = 80;
-
 SnowBall::SnowBall(const lisp::Lisp& reader)
-	: BadGuy(reader, "images/creatures/snowball/snowball.sprite")
+    : WalkingBadguy(reader, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
+  walk_speed = 80;
 }
 
 SnowBall::SnowBall(const Vector& pos, Direction d)
-	: BadGuy(pos, d, "images/creatures/snowball/snowball.sprite")
+    : WalkingBadguy(pos, d, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
+  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);
-  }
-  */
+  WalkingBadguy::write(writer);
   writer.end_list("snowball");
 }
 
-void
-SnowBall::activate()
-{
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
-}
-
 bool
-SnowBall::collision_squished(Player& player)
+SnowBall::collision_squished(GameObject& object)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
-  kill_squished(player);
+  kill_squished(object);
   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")