fix growup, lightmap experiments with willowisp

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

diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp
index efbb84f..7f2b26d 100644 (file)
--- a/src/badguy/rocketexplosion.cpp
+++ b/src/badguy/rocketexplosion.cpp
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "rocketexplosion.h"
+#include "rocketexplosion.hpp"
 
 static const float EXPLOSIONTIME = 1;
 
@@ -29,15 +29,16 @@ RocketExplosion::RocketExplosion(const Vector& pos, Direction dir)
   start_position = pos;
   bbox.set_pos(pos);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("rocketexplosion");
+  sprite = sprite_manager->create("images/creatures/mr_rocket/explosion.sprite");
   this->dir = dir;
+  countMe = false;
   explode();
 }
 
 void
 RocketExplosion::write(lisp::Writer& )
 {
-  // bombs are only temporarily so don't write them out...
+  // rocket explosions are only temporarily so don't write them out...
 }
 
 HitResponse
@@ -64,7 +65,7 @@ RocketExplosion::collision_badguy(BadGuy& badguy, const CollisionHit& )
 }
 
 void
-RocketExplosion::active_action(float )
+RocketExplosion::active_update(float )
 {
    if(timer.check()) {
       remove_me();
@@ -75,14 +76,12 @@ void
 RocketExplosion::explode()
 {
   sprite->set_action(dir == LEFT ? "explosion-left" : "explosion-right");
-  sound_manager->play_sound("explode", get_pos(),
-                            Sector::current()->player->get_pos());
+  sound_manager->play("sounds/explosion.wav", get_pos());
   timer.start(EXPLOSIONTIME, true);
 }
 
 void
 RocketExplosion::kill_fall()
 {
-  explode();
 }