Made trampolines less likely to interfere with level design:

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

diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp
index e7aaed3..4e0520c 100644 (file)
--- a/src/badguy/rocketexplosion.cpp
+++ b/src/badguy/rocketexplosion.cpp
@@ -1,38 +1,45 @@
+//  $Id$
+//
+//  SuperTux
+//  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
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  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.
+
 #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();
 }
 
 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;
 }
 
@@ -44,7 +51,7 @@ RocketExplosion::collision_badguy(BadGuy& badguy, const CollisionHit& )
 }
 
 void
-RocketExplosion::active_action(float elapsed_time)
+RocketExplosion::active_update(float )
 {
    if(timer.check()) {
       remove_me();
@@ -55,14 +62,12 @@ void
 RocketExplosion::explode()
 {
   sprite->set_action(dir == LEFT ? "explosion-left" : "explosion-right");
-  SoundManager::get()->play_sound(IDToSound(SND_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();
 }