fix collision against spikes too wide, fix paths, try to fix jumping on badguys that...

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

diff --git a/src/badguy/mrrocket.cpp b/src/badguy/mrrocket.cpp
index 035bb64..2c73f9f 100644 (file)
--- a/src/badguy/mrrocket.cpp
+++ b/src/badguy/mrrocket.cpp
@@ -1,6 +1,26 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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 "mrrocket.h"
+#include "mrrocket.hpp"
 
 static const float SPEED = 200;
 
@@ -9,7 +29,7 @@ MrRocket::MrRocket(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mrrocket");
+  sprite = sprite_manager->create("images/creatures/mr_rocket/mr_rocket.sprite");
   set_direction = false;
 }
 
@@ -18,7 +38,7 @@ MrRocket::MrRocket(float pos_x, float pos_y, Direction d)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mrrocket");
+  sprite = sprite_manager->create("images/creatures/mr_rocket/mr_rocket.sprite");
   set_direction = true;
   initial_direction = d;
 }
@@ -44,7 +64,7 @@ MrRocket::activate()
 }
 
 void
-MrRocket::active_action(float elapsed_time)
+MrRocket::active_update(float elapsed_time)
 {
   if (collision_timer.check()) {
     Sector::current()->add_object(new RocketExplosion(get_pos(), dir));
@@ -61,6 +81,7 @@ MrRocket::collision_squished(Player& player)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
   kill_squished(player);
+  kill_fall();
   return true;
 }