X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fflyingsnowball.cpp;h=9cc2363b8df46aa8b7f499703f3999487a3e8ec7;hb=49a77878ac4305abbb51439e840f71fab066e692;hp=b95e487f6d4f88e1ebe93fd51195ed6d4c32a16b;hpb=523d415707de9f777729534f467779d4c5acdf6e;p=supertux.git

diff --git a/src/badguy/flyingsnowball.cpp b/src/badguy/flyingsnowball.cpp
index b95e487f6..9cc2363b8 100644
--- a/src/badguy/flyingsnowball.cpp
+++ b/src/badguy/flyingsnowball.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,35 +12,37 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
+
 #include <stdio.h>
 
-#include "flyingsnowball.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 FLYTIME = 1.0f;
+static const float FLYSPEED = -100.0f;
+
+namespace {
+  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);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("flyingsnowball");
   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;
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("flyingsnowball");
   physic.enable_gravity(false);
 }
 
@@ -55,8 +57,8 @@ FlyingSnowBall::write(lisp::Writer& writer)
   writer.end_list("flyingsnowball");
 }
 
-void 
-FlyingSnowBall::activate()
+void
+FlyingSnowBall::initialize()
 {
   sprite->set_action(dir == LEFT ? "left" : "right");
   mode = FLY_UP;
@@ -64,40 +66,67 @@ FlyingSnowBall::activate()
   timer.start(FLYTIME/2);
 }
 
+void
+FlyingSnowBall::activate()
+{
+  puff_timer.start(systemRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX));
+}
+
 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) {
       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);
   }
   movement=physic.get_movement(elapsed_time);
-  dir= Sector::current()->player->get_pos().x>get_pos().x?RIGHT:LEFT;
-  sprite->set_action(dir == LEFT ? "left" : "right");
+
+  Player* player = this->get_nearest_player();
+  if (player) {
+    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")