Rolled back bomb to old behaviour, some bomb gfx tuning

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

diff --git a/src/badguy/mrrocket.hpp b/src/badguy/mrrocket.hpp
index 11ae037..4ff1209 100644 (file)
--- a/src/badguy/mrrocket.hpp
+++ b/src/badguy/mrrocket.hpp
@@ -22,7 +22,6 @@
 
 #include "badguy.hpp"
 #include "timer.hpp"
-#include "rocketexplosion.hpp"
 
 class MrRocket : public BadGuy
 {
@@ -30,7 +29,7 @@ public:
   MrRocket(const lisp::Lisp& reader);
   MrRocket(const Vector& pos, Direction d);
 
-  void activate();
+  void initialize();
   void active_update(float elapsed_time);
   void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
@@ -38,7 +37,7 @@ public:
   virtual MrRocket* clone() const { return new MrRocket(*this); }
 
 protected:
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
   Timer collision_timer;
 };