X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbouncing_snowball.cpp;h=edbe4d793c1837dd9435ef92b520a1cf687ddd7d;hb=16ed8c7ce29177a68fbf64d4cfc03739ae75c094;hp=97f40c30161cb5ef2ebbc2ea9a1e2547d1fa8b1a;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/badguy/bouncing_snowball.cpp b/src/badguy/bouncing_snowball.cpp
index 97f40c301..edbe4d793 100644
--- a/src/badguy/bouncing_snowball.cpp
+++ b/src/badguy/bouncing_snowball.cpp
@@ -5,21 +5,32 @@
 static const float JUMPSPEED = 450;
 static const float WALKSPEED = 80;
 
-BouncingSnowball::BouncingSnowball(LispReader& reader)
+BouncingSnowball::BouncingSnowball(const lisp::Lisp& reader)
 {
-  reader.read_float("x", start_position.x);
-  reader.read_float("y", start_position.y);
-  bbox.set_size(32, 32);
+  reader.get("x", start_position.x);
+  reader.get("y", start_position.y);
+  bbox.set_size(31.8, 31.8);
   sprite = sprite_manager->create("bouncingsnowball");
+  set_direction = false;
+}
+
+BouncingSnowball::BouncingSnowball(float pos_x, float pos_y, Direction d)
+{
+   start_position.x = pos_x;
+   start_position.y = pos_y;
+   bbox.set_size(31.8, 31.8);
+   sprite = sprite_manager->create("bouncingsnowball");
+   set_direction = true;
+   initial_direction = d;
 }
 
 void
-BouncingSnowball::write(LispWriter& writer)
+BouncingSnowball::write(lisp::Writer& writer)
 {
   writer.start_list("bouncingsnowball");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("bouncingsnowball");
 }
@@ -27,6 +38,7 @@ BouncingSnowball::write(LispWriter& writer)
 void
 BouncingSnowball::activate()
 {
+  if (set_direction) {dir = initial_direction;}
   physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
@@ -40,7 +52,7 @@ BouncingSnowball::collision_squished(Player& player)
 }
 
 HitResponse
-BouncingSnowball::collision_solid(GameObject& other, const CollisionHit& hit)
+BouncingSnowball::collision_solid(GameObject& , const CollisionHit& hit)
 {
   if(hit.normal.y < -.5) { // hit floor
     physic.set_velocity_y(JUMPSPEED);
@@ -55,3 +67,19 @@ BouncingSnowball::collision_solid(GameObject& other, const CollisionHit& hit)
   return CONTINUE;
 }
 
+HitResponse
+BouncingSnowball::collision_badguy(BadGuy& , const CollisionHit& hit)
+{
+  if(fabsf(hit.normal.x) > .8) { // left/right?
+    dir = dir == LEFT ? RIGHT : LEFT;
+    sprite->set_action(dir == LEFT ? "left" : "right");    
+    physic.set_velocity_x(-physic.get_velocity_x());
+  } else if(hit.normal.y < -.8) { // grounf
+    physic.set_velocity_y(JUMPSPEED);
+  }
+
+  return CONTINUE;
+}
+
+IMPLEMENT_FACTORY(BouncingSnowball, "bouncingsnowball")
+