X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fflyingsnowball.cpp;h=a0abf233a565c4bf1d78d4f659a15084e62874bc;hb=c655b296af60a436a8ce2bf0e6ede4f72eae0580;hp=e7bd28a80e0fca48deddbc17d5987ed87d418b7f;hpb=16262ff3cac7fdd1de8dc46a967f93cce902ed7f;p=supertux.git

diff --git a/src/badguy/flyingsnowball.cpp b/src/badguy/flyingsnowball.cpp
index e7bd28a80..a0abf233a 100644
--- a/src/badguy/flyingsnowball.cpp
+++ b/src/badguy/flyingsnowball.cpp
@@ -25,30 +25,24 @@
 #include "random_generator.hpp"
 #include "object/sprite_particle.hpp"
 
-static const float FLYTIME = 1.0;
-static const float FLYSPEED = 100.0;
+static const float FLYTIME = 1.0f;
+static const float FLYSPEED = -100.0f;
 
 namespace {
-  const float PUFF_PROBABILITY = 0.1; /**< chanche of puffs being spawned in the current cycle */
-  const float PUFF_INTERVAL_MIN = 0.1; /**< spawn new puff of smoke at most that often */
-  const float PUFF_INTERVAL_MAX = 1.1; /**< spawn new puff of smoke at least that often */
+  const float PUFF_PROBABILITY = 0.1f; /**< chanche of puffs being spawned in the current cycle */
+  const float PUFF_INTERVAL_MIN = 0.1f; /**< spawn new puff of smoke at most that often */
+  const float PUFF_INTERVAL_MAX = 1.1f; /**< spawn new puff of smoke at least that often */
 }
 
 FlyingSnowBall::FlyingSnowBall(const lisp::Lisp& reader)
+	: BadGuy(reader, "images/creatures/flying_snowball/flying_snowball.sprite")
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  sprite = sprite_manager->create("images/creatures/flying_snowball/flying_snowball.sprite");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
   physic.enable_gravity(false);
 }
 
-FlyingSnowBall::FlyingSnowBall(float pos_x, float pos_y)
+FlyingSnowBall::FlyingSnowBall(const Vector& pos)
+	: BadGuy(pos, "images/creatures/flying_snowball/flying_snowball.sprite")
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  sprite = sprite_manager->create("images/creatures/flying_snowball/flying_snowball.sprite");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
   physic.enable_gravity(false);
 }
 
@@ -63,7 +57,7 @@ FlyingSnowBall::write(lisp::Writer& writer)
   writer.end_list("flyingsnowball");
 }
 
-void 
+void
 FlyingSnowBall::activate()
 {
   sprite->set_action(dir == LEFT ? "left" : "right");
@@ -74,25 +68,23 @@ FlyingSnowBall::activate()
 }
 
 bool
-FlyingSnowBall::collision_squished(Player& player)
+FlyingSnowBall::collision_squished(GameObject& object)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
-  kill_squished(player);
+  kill_squished(object);
   return true;
 }
 
-HitResponse
-FlyingSnowBall::collision_solid(GameObject& , const CollisionHit& hit)
+void
+FlyingSnowBall::collision_solid(const CollisionHit& hit)
 {
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
+  if(hit.top || hit.bottom) {
     physic.set_velocity_y(0);
   }
-
-  return CONTINUE;
 }
 
 void
-FlyingSnowBall::active_update(float elapsed_time) 
+FlyingSnowBall::active_update(float elapsed_time)
 {
   if(timer.check()) {
     if(mode == FLY_UP) {
@@ -101,7 +93,7 @@ FlyingSnowBall::active_update(float elapsed_time)
 
       // stop puffing
       puff_timer.stop();
-      
+
     } else if(mode == FLY_DOWN) {
       mode = FLY_UP;
       physic.set_velocity_y(FLYSPEED);
@@ -127,7 +119,7 @@ FlyingSnowBall::active_update(float elapsed_time)
     Vector ppos = bbox.get_middle();
     Vector pspeed = Vector(systemRandom.randf(-10, 10), 150);
     Vector paccel = Vector(0,0);
-    Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", ppos, pspeed, paccel, LAYER_OBJECTS-1));
+    Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
     puff_timer.start(systemRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX));
   }
 }