*possible* fix for bugs #453 and #373

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

diff --git a/src/badguy/bouncing_snowball.cpp b/src/badguy/bouncing_snowball.cpp
index 616d63e..0449530 100644 (file)
--- a/src/badguy/bouncing_snowball.cpp
+++ b/src/badguy/bouncing_snowball.cpp
@@ -25,8 +25,8 @@ static const float JUMPSPEED = -450;
 static const float WALKSPEED = 80;
 
 BouncingSnowball::BouncingSnowball(const lisp::Lisp& reader)
-       : BadGuy(reader, "images/creatures/bouncing_snowball/bouncing_snowball.sprite")
-{ 
+        : BadGuy(reader, "images/creatures/bouncing_snowball/bouncing_snowball.sprite")
+{
 }
 
 BouncingSnowball::BouncingSnowball(const Vector& pos, Direction d)
@@ -39,24 +39,24 @@ BouncingSnowball::write(lisp::Writer& writer)
 {
   writer.start_list("bouncingsnowball");
 
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
+  writer.write("x", start_position.x);
+  writer.write("y", start_position.y);
 
   writer.end_list("bouncingsnowball");
 }
 
 void
-BouncingSnowball::activate()
+BouncingSnowball::initialize()
 {
   physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
 
 bool
-BouncingSnowball::collision_squished(Player& player)
+BouncingSnowball::collision_squished(GameObject& object)
 {
   sprite->set_action("squished");
-  kill_squished(player);
+  kill_squished(object);
   return true;
 }
 
@@ -72,7 +72,7 @@ BouncingSnowball::collision_solid(const CollisionHit& hit)
   } else if(hit.top) {
     physic.set_velocity_y(0);
   }
-  
+
   if(hit.left || hit.right) { // left or right collision
     dir = dir == LEFT ? RIGHT : LEFT;
     sprite->set_action(dir == LEFT ? "left" : "right");
@@ -88,4 +88,3 @@ BouncingSnowball::collision_badguy(BadGuy& , const CollisionHit& hit)
 }
 
 IMPLEMENT_FACTORY(BouncingSnowball, "bouncingsnowball")
-