X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Frocketexplosion.cpp;h=4e0520c2f1d79c3574c342ee9f438baac5dae5ed;hb=d84d73b701cc7fa2bd74f3490b9be1bf8b6f705a;hp=c20571f3d6b07cbb7940aa18bd33d8aaaf1c4f39;hpb=0676f7c09ab0d99e5b6a3bf74b9e2b62aaa885d4;p=supertux.git

diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp
index c20571f3d..4e0520c2f 100644
--- 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,25 +12,20 @@
 //  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;
 
 RocketExplosion::RocketExplosion(const Vector& pos, Direction dir)
+	: BadGuy(pos, dir, "images/creatures/mr_rocket/explosion.sprite")
 {
-  start_position = pos;
-  bbox.set_pos(pos);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("rocketexplosion");
-  this->dir = dir;
   countMe = false;
   explode();
 }
@@ -38,22 +33,13 @@ RocketExplosion::RocketExplosion(const Vector& pos, Direction dir)
 void
 RocketExplosion::write(lisp::Writer& )
 {
-  // bombs are only temporarily so don't write them out...
-}
-
-HitResponse
-RocketExplosion::collision_solid(GameObject& , const CollisionHit& hit)
-{
-  if(fabsf(hit.normal.y) > .5)
-    physic.set_velocity_y(0);
-
-  return CONTINUE;
+  // rocket explosions are only temporarily so don't write them out...
 }
 
 HitResponse
 RocketExplosion::collision_player(Player& player, const CollisionHit& )
 {
-  player.kill(Player::SHRINK);
+  player.kill(false);
   return ABORT_MOVE;
 }
 
@@ -76,14 +62,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();
 }