X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Frocketexplosion.cpp;h=dcc612014dfcb71ff891eca5ade00a6832adf122;hb=0222881aae90660c925ea2733cd8c80be7ac837b;hp=7f2b26d3e4d8c43eeb7b214fd5c5d819600ac658;hpb=59830f3f564e175f04f58833d2b52efc791abead;p=supertux.git

diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp
index 7f2b26d3e..dcc612014 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,11 +12,10 @@
 //  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>
 
@@ -25,11 +24,8 @@
 static const float EXPLOSIONTIME = 1;
 
 RocketExplosion::RocketExplosion(const Vector& pos, Direction dir)
+	: BadGuy(pos, "images/creatures/mr_rocket/explosion.sprite")
 {
-  start_position = pos;
-  bbox.set_pos(pos);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/mr_rocket/explosion.sprite");
   this->dir = dir;
   countMe = false;
   explode();
@@ -53,7 +49,7 @@ RocketExplosion::collision_solid(GameObject& , const CollisionHit& hit)
 HitResponse
 RocketExplosion::collision_player(Player& player, const CollisionHit& )
 {
-  player.kill(Player::SHRINK);
+  player.kill(false);
   return ABORT_MOVE;
 }