X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.hpp;h=fec7007cbb7e11f8c6e7e58511badacbc7d85758;hb=f2d345c3ccec7743e39df2f59e546ad415257b81;hp=2f21f6d0aa53e1cc1ecd517bd80052bf50c4fde5;hpb=9f98af91f3501e30ff59e42b8d9e056f5c8064ba;p=supertux.git diff --git a/src/object/player.hpp b/src/object/player.hpp index 2f21f6d0a..fec7007cb 100644 --- a/src/object/player.hpp +++ b/src/object/player.hpp @@ -81,7 +81,7 @@ extern TuxBodyParts* big_tux; extern TuxBodyParts* fire_tux; extern TuxBodyParts* ice_tux; -class Player : public MovingObject, public Scripting::Player, public ScriptInterface +class Player : public MovingObject, public UsesPhysic, public Scripting::Player, public ScriptInterface { public: enum FallMode { ON_GROUND, JUMPING, TRAMPOLINE_JUMP, FALLING }; @@ -119,7 +119,6 @@ public: Timer growing_timer; Timer idle_timer; Timer backflip_timer; - Physic physic; public: Player(PlayerStatus* player_status, const std::string& name); @@ -160,6 +159,7 @@ public: virtual bool add_bonus(const std::string& bonus); virtual void add_coins(int count); + virtual int get_coins(); /** * picks up a bonus, taking care not to pick up lesser bonus items than we already have @@ -251,6 +251,11 @@ public: */ bool adjust_height(float new_height); + /** + * Orders the current GameSession to start a sequence + */ + void trigger_sequence(std::string sequence_name); + private: void handle_input(); void handle_input_ghost(); /**< input handling while in ghost mode */