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

diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp
index e7f594b8c..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,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,12 +24,8 @@
 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();
 }
@@ -42,18 +37,9 @@ RocketExplosion::write(lisp::Writer& )
 }
 
 HitResponse
-RocketExplosion::collision_solid(GameObject& , const CollisionHit& hit)
-{
-  if(fabsf(hit.normal.y) > .5)
-    physic.set_velocity_y(0);
-
-  return CONTINUE;
-}
-
-HitResponse
 RocketExplosion::collision_player(Player& player, const CollisionHit& )
 {
-  player.kill(Player::SHRINK);
+  player.kill(false);
   return ABORT_MOVE;
 }