Merged back changes from 0.3.x branch

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

diff --git a/src/badguy/zeekling.hpp b/src/badguy/zeekling.hpp
index 1784237..a130179 100644 (file)
--- a/src/badguy/zeekling.hpp
+++ b/src/badguy/zeekling.hpp
@@ -38,7 +38,7 @@ public:
   virtual Zeekling* clone() const { return new Zeekling(*this); }
 
 protected:
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
   float speed;
 
   Timer diveRecoverTimer;
@@ -51,10 +51,13 @@ protected:
   ZeeklingState state;
 
 private:
+  const MovingObject* last_player; /**< last player we tracked */
+  Vector last_player_pos; /**< position we last spotted the player at */
+  Vector last_self_pos; /**< position we last were at */
+
   bool should_we_dive();
   void onBumpHorizontal();
   void onBumpVertical();
 };
 
 #endif
-