Updating cherrybomb, adding juicebox (blue bomb).

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

diff --git a/src/badguy/kugelblitz.cpp b/src/badguy/kugelblitz.cpp
index 8d0c77b..f8ecf17 100644 (file)
--- a/src/badguy/kugelblitz.cpp
+++ b/src/badguy/kugelblitz.cpp
@@ -34,12 +34,9 @@ static const float X_OFFSCREEN_DISTANCE = 1600;
 static const float Y_OFFSCREEN_DISTANCE = 1200;
 
 Kugelblitz::Kugelblitz(const lisp::Lisp& reader)
-    : groundhit_pos_set(false)
+    : BadGuy(Vector(0,0), "images/creatures/kugelblitz/kugelblitz.sprite"), groundhit_pos_set(false)
 {
   reader.get("x", start_position.x);
-  start_position.y = 0; //place above visible area
-  bbox.set_size(63.8, 63.8);
-  sprite = sprite_manager->create("images/creatures/kugelblitz/kugelblitz.sprite");
   sprite->set_action("falling");
   physic.enable_gravity(false);
 }
@@ -57,7 +54,7 @@ Kugelblitz::write(lisp::Writer& writer)
 void
 Kugelblitz::activate()
 {
-  physic.set_velocity_y(-300);
+  physic.set_velocity_y(300);
   physic.set_velocity_x(-20); //fall a little to the left
   direction = 1;
   dying = false;
@@ -81,11 +78,11 @@ Kugelblitz::collision_player(Player& player, const CollisionHit& )
       (get_bbox().p1.y + get_bbox().p2.y) / 2) {
     // if it's not is it possible to squish us, then this will hurt
     if(!collision_squished(player))
-      player.kill(Player::SHRINK);
+      player.kill(false);
       explode();
     return FORCE_MOVE;
   }
-  player.kill(Player::SHRINK);
+  player.kill(false);
   explode();
   return FORCE_MOVE;
 }