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 af8b1a8..413b5c2 100644 (file)
--- a/src/badguy/fish.hpp
+++ b/src/badguy/fish.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,11 +12,11 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef __FISH_H__
 #define __FISH_H__
 
@@ -26,19 +26,26 @@ class Fish : public BadGuy
 {
 public:
   Fish(const lisp::Lisp& );
-  Fish(float , float );
+  Fish(const Vector& pos);
 
-  HitResponse collision_solid(GameObject& , const CollisionHit& );
+  void draw(DrawingContext& context);
+
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& , const CollisionHit& );
+  void collision_tile(uint32_t tile_attributes);
 
   void write(lisp::Writer& );
   void active_update(float);
 
+  virtual Fish* clone() const { return new Fish(*this); }
+
 private:
   HitResponse hit(const CollisionHit& );
-  bool waiting;
-  float waiting_for;
   void start_waiting();
+  void jump();
+
+  Timer waiting;
+  float stop_y; /**< y-coordinate to stop at */
 };
 
 #endif