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 ab88a9a..a130179 100644 (file)
--- a/src/badguy/zeekling.hpp
+++ b/src/badguy/zeekling.hpp
@@ -28,19 +28,17 @@ class Zeekling : public BadGuy
 {
 public:
   Zeekling(const lisp::Lisp& reader);
-  Zeekling(float pos_x, float pos_y, Direction d);
+  Zeekling(const Vector& pos, Direction d);
 
   void activate();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   void active_update(float elapsed_time);
 
   virtual Zeekling* clone() const { return new Zeekling(*this); }
 
 protected:
-  bool collision_squished(Player& player);
-  bool set_direction;
-  Direction initial_direction;
+  bool collision_squished(GameObject& object);
   float speed;
 
   Timer diveRecoverTimer;
@@ -53,11 +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
-