X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Ffish.hpp;h=eb58db4262c0a365c9461a9d82d1e35084fae792;hb=cb95eae480d25b207fc78d5bd1ec2209f25fe187;hp=812678396bc8ba92d2d6bdf9606c84435cad791d;hpb=58eb3364f724b2100859fd39da9bba5a9a09cafc;p=supertux.git

diff --git a/src/badguy/fish.hpp b/src/badguy/fish.hpp
index 812678396..eb58db426 100644
--- a/src/badguy/fish.hpp
+++ b/src/badguy/fish.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,37 +12,40 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __FISH_H__
-#define __FISH_H__
+#ifndef HEADER_SUPERTUX_BADGUY_FISH_HPP
+#define HEADER_SUPERTUX_BADGUY_FISH_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class Fish : public BadGuy
 {
 public:
-  Fish(const lisp::Lisp& );
-  Fish(float x, float y);
+  Fish(const Reader& );
+  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);
 
-  void write(lisp::Writer& );
   void active_update(float);
 
-  virtual Fish* clone() const { return new Fish(*this); }
+  void freeze();
+  void unfreeze();
+  bool is_freezable() const;
 
 private:
   HitResponse hit(const CollisionHit& );
   void start_waiting();
   void jump();
-  
+
   Timer waiting;
+  float stop_y; /**< y-coordinate to stop at */
 };
 
 #endif
+
+/* EOF */