Patchs by Matt McCutche to fix Treeboss related Bugs 469 and 504.

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

diff --git a/src/badguy/mrrocket.hpp b/src/badguy/mrrocket.hpp
index 25500ec..4ff1209 100644 (file)
--- a/src/badguy/mrrocket.hpp
+++ b/src/badguy/mrrocket.hpp
@@ -22,27 +22,23 @@
 
 #include "badguy.hpp"
 #include "timer.hpp"
-#include "rocketexplosion.hpp"
 
 class MrRocket : public BadGuy
 {
 public:
   MrRocket(const lisp::Lisp& reader);
-  MrRocket(float pos_x, float pos_y, Direction d);
+  MrRocket(const Vector& pos, Direction d);
 
-  void activate();
+  void initialize();
   void active_update(float elapsed_time);
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
 
   virtual MrRocket* clone() const { return new MrRocket(*this); }
 
 protected:
-  bool collision_squished(Player& player);
-  bool set_direction;
-  Direction initial_direction;
+  bool collision_squished(GameObject& object);
   Timer collision_timer;
 };
 
 #endif
-