Massive copyright update. I'm sorry if I'm crediting Matze for something he didn...

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

diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp
index 6929ea6..c5f32aa 100644 (file)
--- a/src/badguy/rocketexplosion.cpp
+++ b/src/badguy/rocketexplosion.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,15 +12,14 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 
-#include "rocketexplosion.h"
+#include "rocketexplosion.hpp"
 
 static const float EXPLOSIONTIME = 1;
 
@@ -29,7 +28,7 @@ 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();
@@ -38,7 +37,7 @@ RocketExplosion::RocketExplosion(const Vector& pos, Direction dir)
 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
@@ -76,14 +75,12 @@ void
 RocketExplosion::explode()
 {
   sprite->set_action(dir == LEFT ? "explosion-left" : "explosion-right");
-  sound_manager->play_sound("explosion", get_pos(),
-                            Sector::current()->player->get_pos());
+  sound_manager->play("sounds/explosion.wav", get_pos());
   timer.start(EXPLOSIONTIME, true);
 }
 
 void
 RocketExplosion::kill_fall()
 {
-  explode();
 }