X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fflyingsnowball.cpp;h=66a2db504ddf94fbf0601e8ce8088414b51a9e17;hb=c8303cceed3279a3580829a28bbb2d7b8d89843b;hp=a9ef465dc8f6dc380e22713cbeb5da21806cc359;hpb=b51a3e05e9212c00c3bf7d00c6c2bf33fe8e2970;p=supertux.git

diff --git a/src/badguy/flyingsnowball.cpp b/src/badguy/flyingsnowball.cpp
index a9ef465dc..66a2db504 100644
--- a/src/badguy/flyingsnowball.cpp
+++ b/src/badguy/flyingsnowball.cpp
@@ -22,25 +22,27 @@
 #include <stdio.h>
 
 #include "flyingsnowball.hpp"
+#include "random_generator.hpp"
+#include "object/sprite_particle.hpp"
 
 static const float FLYTIME = 1.0;
-static const float FLYSPEED = 100.0;
+static const float FLYSPEED = -100.0;
+
+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 */
+}
 
 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);
 }
 
@@ -62,6 +64,7 @@ FlyingSnowBall::activate()
   mode = FLY_UP;
   physic.set_velocity_y(FLYSPEED);
   timer.start(FLYTIME/2);
+  puff_timer.start(systemRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX));
 }
 
 bool
@@ -72,14 +75,12 @@ FlyingSnowBall::collision_squished(Player& player)
   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
@@ -89,9 +90,19 @@ FlyingSnowBall::active_update(float elapsed_time)
     if(mode == FLY_UP) {
       mode = FLY_DOWN;
       physic.set_velocity_y(-FLYSPEED);
+
+      // stop puffing
+      puff_timer.stop();
+      
     } else if(mode == FLY_DOWN) {
       mode = FLY_UP;
       physic.set_velocity_y(FLYSPEED);
+
+      // roll a dice whether to start puffing
+      if (systemRandom.randf(0, 1) < PUFF_PROBABILITY) {
+        puff_timer.start(systemRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX));
+      }
+
     }
     timer.start(FLYTIME);
   }
@@ -102,6 +113,15 @@ FlyingSnowBall::active_update(float elapsed_time)
     dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
     sprite->set_action(dir == LEFT ? "left" : "right");
   }
+
+  // spawn smoke puffs
+  if (puff_timer.check()) {
+    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", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
+    puff_timer.start(systemRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX));
+  }
 }
 
 IMPLEMENT_FACTORY(FlyingSnowBall, "flyingsnowball")