X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fpoisonivy.cpp;h=ae118276cfb83ecbe00d15ca97959d10a79523ed;hb=7c2f8e23f9accd00bd9ee2319da8ab8aa341c7cf;hp=9a30f62247cd3530d875318ee3b5dc9bf0550d8f;hpb=b51a3e05e9212c00c3bf7d00c6c2bf33fe8e2970;p=supertux.git

diff --git a/src/badguy/poisonivy.cpp b/src/badguy/poisonivy.cpp
index 9a30f6224..ae118276c 100644
--- a/src/badguy/poisonivy.cpp
+++ b/src/badguy/poisonivy.cpp
@@ -20,26 +20,19 @@
 #include <config.h>
 
 #include "poisonivy.hpp"
+#include "random_generator.hpp"
+#include "object/sprite_particle.hpp"
 
 static const float WALKSPEED = 80;
 
 PoisonIvy::PoisonIvy(const lisp::Lisp& reader)
+	: BadGuy(reader, "images/creatures/poison_ivy/poison_ivy.sprite")
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  sprite = sprite_manager->create("images/creatures/poison_ivy/poison_ivy.sprite");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
-  set_direction = false;
 }
 
-PoisonIvy::PoisonIvy(float pos_x, float pos_y, Direction d)
+PoisonIvy::PoisonIvy(const Vector& pos, Direction d)
+	: BadGuy(pos, d, "images/creatures/poison_ivy/poison_ivy.sprite")
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  sprite = sprite_manager->create("images/creatures/poison_ivy/poison_ivy.sprite");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
-  set_direction = true;
-  initial_direction = d;
 }
 
 void
@@ -56,7 +49,6 @@ PoisonIvy::write(lisp::Writer& writer)
 void
 PoisonIvy::activate()
 {
-  if (set_direction) {dir = initial_direction;}
   physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
@@ -65,6 +57,18 @@ bool
 PoisonIvy::collision_squished(Player& player)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
+   // spawn some particles
+    // TODO: provide convenience function in MovingSprite or MovingObject?
+  	   for (int i = 0; i < 3; i++) {
+  	     Vector ppos = bbox.get_middle();
+  	     float angle = systemRandom.randf(-M_PI_2, M_PI_2);
+  	     float velocity = systemRandom.randf(350, 400);
+  	     float vx = sin(angle)*velocity;
+  	     float vy = -cos(angle)*velocity;
+  	     Vector pspeed = Vector(vx, vy);
+  	     Vector paccel = Vector(0, 100);
+  	     Sector::current()->add_object(new SpriteParticle("images/objects/particles/poisonivy.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
+  	   }
   kill_squished(player);
   return true;
 }