* Fixed gradient background bug

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

diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp
index 614bb18..c611337 100644 (file)
--- a/src/badguy/bomb.cpp
+++ b/src/badguy/bomb.cpp
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "bomb.h"
+#include "bomb.hpp"
 
 static const float TICKINGTIME = 1;
 static const float EXPLOSIONTIME = 1;
@@ -35,6 +35,7 @@ Bomb::Bomb(const Vector& pos, Direction dir)
   timer.start(TICKINGTIME);
   this->dir = dir;
   sprite->set_action(dir == LEFT ? "ticking-left" : "ticking-right");
+  countMe = false;
 }
 
 void
@@ -70,7 +71,7 @@ Bomb::collision_badguy(BadGuy& badguy, const CollisionHit& )
 }
 
 void
-Bomb::active_action(float )
+Bomb::active_update(float )
 {
   switch(state) {
     case 0:
@@ -91,14 +92,14 @@ Bomb::explode()
 {
   state = 1;
   sprite->set_action("explosion");
-  sound_manager->play_sound("explosion", get_pos(),
-                            Sector::current()->player->get_pos());
+  sound_manager->play("sounds/explosion.wav", get_pos());
   timer.start(EXPLOSIONTIME);
 }
 
 void
 Bomb::kill_fall()
 {
-  explode();
+  if (state != 1)  // we don't want it exploding again
+    explode();
 }