fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp
index dcc6120..2c24ccb 100644 (file)
--- a/src/badguy/rocketexplosion.cpp
+++ b/src/badguy/rocketexplosion.cpp
@@ -24,9 +24,8 @@
 static const float EXPLOSIONTIME = 1;
 
 RocketExplosion::RocketExplosion(const Vector& pos, Direction dir)
-       : BadGuy(pos, "images/creatures/mr_rocket/explosion.sprite")
+       : BadGuy(pos, dir, "images/creatures/mr_rocket/explosion.sprite")
 {
-  this->dir = dir;
   countMe = false;
   explode();
 }
@@ -38,15 +37,6 @@ 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(false);
@@ -80,4 +70,3 @@ void
 RocketExplosion::kill_fall()
 {
 }
-