X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.hpp;h=fec7007cbb7e11f8c6e7e58511badacbc7d85758;hb=f2d345c3ccec7743e39df2f59e546ad415257b81;hp=de229492e23b64837d59470b57c25801da8ba19f;hpb=d02eab1f7ab3398c4e6c383d48fb7dee0a8a76f2;p=supertux.git diff --git a/src/object/player.hpp b/src/object/player.hpp index de229492e..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); @@ -252,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 */