X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fzeekling.hpp;h=3979dd19ea52ebdeb030da4ed25ebb70f978a82d;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=0b3532e0be171aab87e405bfab0554e30d86aef4;hpb=12966e3f986f7202125ae590c74a4d0c227441dd;p=supertux.git

diff --git a/src/badguy/zeekling.hpp b/src/badguy/zeekling.hpp
index 0b3532e0b..3979dd19e 100644
--- a/src/badguy/zeekling.hpp
+++ b/src/badguy/zeekling.hpp
@@ -2,7 +2,7 @@
 //
 //  Zeekling - flyer that swoops down when she spots the player
 //  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
-//  Copyright (C) 2006 Christoph Sommer <supertux@2006.expires.deltadevelopment.de>
+//  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -30,17 +30,15 @@ public:
   Zeekling(const lisp::Lisp& reader);
   Zeekling(const Vector& pos, Direction d);
 
-  void activate();
+  void initialize();
   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();
-  std::string direction;
 };
 
 #endif
-