X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Ffish.hpp;h=fa36dee97e3ba9a68f58d796e39b30cb1dd7a785;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=812678396bc8ba92d2d6bdf9606c84435cad791d;hpb=58eb3364f724b2100859fd39da9bba5a9a09cafc;p=supertux.git diff --git a/src/badguy/fish.hpp b/src/badguy/fish.hpp index 812678396..fa36dee97 100644 --- a/src/badguy/fish.hpp +++ b/src/badguy/fish.hpp @@ -26,25 +26,30 @@ 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); void write(lisp::Writer& ); void active_update(float); + void freeze(); + void unfreeze(); + bool is_freezable() const; + virtual Fish* clone() const { return new Fish(*this); } private: HitResponse hit(const CollisionHit& ); void start_waiting(); void jump(); - + Timer waiting; + float stop_y; /**< y-coordinate to stop at */ }; #endif