Merged back changes from 0.3.x branch

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

diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp
index c9e2c8a..670baa5 100644 (file)
--- a/src/badguy/bomb.cpp
+++ b/src/badguy/bomb.cpp
@@ -23,7 +23,7 @@
 #include "random_generator.hpp"
 #include "object/sprite_particle.hpp"
 
-Bomb::Bomb(const Vector& pos, Direction dir, std::string custom_sprite /*= "images/creatures/mr_cherry/cherry.sprite"*/ )
+Bomb::Bomb(const Vector& pos, Direction dir, std::string custom_sprite /*= "images/creatures/mr_bomb/mr_bomb.sprite"*/ )
        : BadGuy( pos, dir, custom_sprite )
 {
   state = STATE_TICKING;
@@ -96,7 +96,7 @@ Bomb::active_update(float )
         remove_me();
       }
       break;
-  } 
+  }
 }
 
 void
@@ -106,7 +106,7 @@ Bomb::explode()
   state = STATE_EXPLODING;
   set_group(COLGROUP_TOUCHABLE);
   sound_manager->play("sounds/explosion.wav", get_pos());
-  set_action_centered("explosion", 1);
+  set_action("explosion", 1, ANCHOR_BOTTOM);
 
   // spawn some particles
   // TODO: provide convenience function in MovingSprite or MovingObject?
@@ -118,7 +118,7 @@ Bomb::explode()
     float vy = -cos(angle)*velocity;
     Vector pspeed = Vector(vx, vy);
     Vector paccel = Vector(0, 1000);
-    Sector::current()->add_object(new SpriteParticle("images/objects/particles/kracker.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
+    Sector::current()->add_object(new SpriteParticle("images/objects/particles/explosion.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
   }
 
 }
@@ -129,4 +129,3 @@ Bomb::kill_fall()
   if (state != STATE_EXPLODING)  // we don't want it exploding again
     explode();
 }
-