X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.h;h=6852ebc14e956c2569cb3f45d02098de6a21550b;hb=157cef71aeb9ae25b7bb90f37dda11bc09329d11;hp=04473f2a2aa827a343fcecb1260bb9db50acf745;hpb=b8c83bae1b0cd0367b6e3ac8c4c28e077eb1b594;p=supertux.git diff --git a/src/player.h b/src/player.h index 04473f2a2..6852ebc14 100644 --- a/src/player.h +++ b/src/player.h @@ -119,6 +119,7 @@ public: int size; bool duck; bool holding_something; + bool dead; DyingType dying; Direction dir; @@ -140,6 +141,7 @@ public: Timer frame_timer; Timer kick_timer; Timer shooting_timer; // used to show the arm when Tux is shooting + Timer dying_timer; Physic physic; public: @@ -158,14 +160,15 @@ public: void collision(void* p_c_object, int c_object); void kill(HurtMode mode); - void is_dying(); - bool is_dead(); void player_remove_powerups(); void check_bounds(Camera& viewport, bool back_scrolling, bool hor_autoscroll); bool on_ground(); bool under_solid(); bool tiles_on_air(int tiles); void grow(); + void move(const Vector& vector); + bool is_dead() const + { return dead; } private: void init();