X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.hpp;h=f27decd4a232f4c02374451d9c7351a2b0ddea94;hb=9ba388a672ff024010e38b09e576edf8730bb454;hp=dc23f2ffb1668179983c97d9f9a6ed9b17ec7fa4;hpb=a983f6648d43492632c41e2b7519b70458b53cf4;p=supertux.git

diff --git a/src/object/player.hpp b/src/object/player.hpp
index dc23f2ffb..f27decd4a 100644
--- a/src/object/player.hpp
+++ b/src/object/player.hpp
@@ -39,6 +39,7 @@
 
 class BadGuy;
 class Portable;
+class Climbable;
 
 /* Times: */
 static const float TUX_SAFE_TIME = 1.8f;
@@ -68,7 +69,7 @@ public:
 
   void set_action(std::string action, int loops = -1);
   void one_time_animation();
-  void draw(DrawingContext& context, const Vector& pos, int layer);
+  void draw(DrawingContext& context, const Vector& pos, int layer, Portable* grabbed_object);
 
   Sprite* head;
   Sprite* body;
@@ -259,10 +260,21 @@ public:
    * Orders the current GameSession to start a sequence
    */
   void trigger_sequence(std::string sequence_name);
+  
+  /**
+   * Requests that the player start climbing the given Climbable
+   */
+  void start_climbing(Climbable& climbable);
+
+  /**
+   * Requests that the player stop climbing the given Climbable
+   */
+  void stop_climbing(Climbable& climbable);
 
 private:
   void handle_input();
   void handle_input_ghost(); /**< input handling while in ghost mode */
+  void handle_input_climbing(); /**< input handling while climbing */
   bool deactivated;
 
   void init();
@@ -295,6 +307,8 @@ private:
   bool ghost_mode; /**< indicates if Tux should float around and through solid objects */
 
   Timer unduck_hurt_timer; /**< if Tux wants to stand up again after ducking and cannot, this timer is started */
+
+  Climbable* climbing; /**< Climbable object we are currently climbing, null if none */
 };
 
 #endif /*SUPERTUX_PLAYER_H*/