fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/badguy/fish.hpp b/src/badguy/fish.hpp
index 8126783..413b5c2 100644 (file)
--- a/src/badguy/fish.hpp
+++ b/src/badguy/fish.hpp
@@ -26,11 +26,11 @@ class Fish : public BadGuy
 {
 public:
   Fish(const lisp::Lisp& );
-  Fish(float x, float y);
+  Fish(const Vector& pos);
 
   void draw(DrawingContext& context);
 
-  HitResponse collision_solid(GameObject& , const CollisionHit& );
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& , const CollisionHit& );
   void collision_tile(uint32_t tile_attributes);
 
@@ -43,8 +43,9 @@ private:
   HitResponse hit(const CollisionHit& );
   void start_waiting();
   void jump();
-  
+
   Timer waiting;
+  float stop_y; /**< y-coordinate to stop at */
 };
 
 #endif