X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.hpp;h=fec7007cbb7e11f8c6e7e58511badacbc7d85758;hb=f2d345c3ccec7743e39df2f59e546ad415257b81;hp=885d41ed2b8a2b5d1c15414c1227518f3d292681;hpb=7a051411ba56f285197e047229586865931b748c;p=supertux.git

diff --git a/src/object/player.hpp b/src/object/player.hpp
index 885d41ed2..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 };
@@ -97,7 +97,7 @@ private:
   int  backflip_direction;
   Direction peeking;
   bool swimming;
-  
+
 public:
   Direction dir;
   Direction old_dir;
@@ -119,10 +119,9 @@ public:
   Timer growing_timer;
   Timer idle_timer;
   Timer backflip_timer;
-  Physic physic;
-  
+
 public:
-  Player(PlayerStatus* player_status);
+  Player(PlayerStatus* player_status, const std::string& name);
   virtual ~Player();
 
   virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
@@ -153,25 +152,26 @@ public:
   {
     return peeking;
   }
-  
+
   void kill(bool completely);
   void check_bounds(Camera* camera);
   void move(const Vector& vector);
 
   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
    *
    * @returns true if the bonus has been set (or was already good enough)
    *          false if the bonus could not be set (for example no space for big tux)
    */
-  bool add_bonus(BonusType type, bool animate = false); 
+  bool add_bonus(BonusType type, bool animate = false);
   /**
    * like add_bonus, but can also downgrade the bonus items carried
-   */  
-  bool set_bonus(BonusType type, bool animate = false); 
+   */
+  bool set_bonus(BonusType type, bool animate = false);
 
   PlayerStatus* get_status()
   {
@@ -180,7 +180,7 @@ public:
   // set kick animation
   void kick();
 
-  /** 
+  /**
    * play cheer animation.
    * This might need some space and behave in an unpredictable way. Best to use this at level end.
    */
@@ -235,7 +235,7 @@ public:
   }
 
   /**
-   * Switches ghost mode on/off. 
+   * Switches ghost mode on/off.
    * Lets Tux float around and through solid objects.
    */
   void set_ghost_mode(bool enable);
@@ -251,13 +251,18 @@ 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 */
   bool deactivated;
-  
+
   void init();
-  
+
   void handle_horizontal_input();
   void handle_vertical_input();
 
@@ -278,7 +283,10 @@ private:
   Sprite* smalltux_star;
   Sprite* bigtux_star;
 
+  std::auto_ptr<Surface> airarrow; /**< arrow indicating Tux' position when he's above the camera */
+
   Vector floor_normal;
+  void try_grab();
 
   bool ghost_mode; /**< indicates if Tux should float around and through solid objects */