X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.hpp;h=0fecfef0a5f25dd5a32ff4a8720e0536f33786e6;hb=ab9eab4c870195c2b60ce76b77044c35b31e8806;hp=d4645a1b2a7e5541790d3e9227952681358af758;hpb=b8afc3d299b00df6cb520f033bb19f1a577088fa;p=supertux.git

diff --git a/src/object/player.hpp b/src/object/player.hpp
index d4645a1b2..0fecfef0a 100644
--- a/src/object/player.hpp
+++ b/src/object/player.hpp
@@ -95,7 +95,9 @@ private:
   bool dying;
   bool backflipping;
   int  backflip_direction;
-  
+  Direction peeking;
+  bool swimming;
+
 public:
   Direction dir;
   Direction old_dir;
@@ -118,9 +120,9 @@ public:
   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);
@@ -134,6 +136,7 @@ public:
 
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
+  virtual void collision_solid(const CollisionHit& hit);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
   virtual void collision_tile(uint32_t tile_attributes);
 
@@ -146,15 +149,30 @@ public:
   {
     return dying;
   }
-  
+  Direction peeking_direction() const
+  {
+    return peeking;
+  }
+
   void kill(bool completely);
   void check_bounds(Camera* camera);
   void move(const Vector& vector);
 
-  virtual void add_bonus(const std::string& bonus);
+  virtual bool add_bonus(const std::string& bonus);
   virtual void add_coins(int count);
-  void add_bonus(BonusType type, bool animate = false); /**< picks up a bonus, taking care not to pick up lesser bonus items than we already have */
-  void set_bonus(BonusType type, bool animate = false); /**< like add_bonus, but can also downgrade the bonus items carried */
+
+  /**
+   * 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);
+  /**
+   * like add_bonus, but can also downgrade the bonus items carried
+   */
+  bool set_bonus(BonusType type, bool animate = false);
+
   PlayerStatus* get_status()
   {
     return player_status;
@@ -163,6 +181,34 @@ public:
   void kick();
 
   /**
+   * play cheer animation.
+   * This might need some space and behave in an unpredictable way. Best to use this at level end.
+   */
+  void do_cheer();
+
+  /**
+   * duck down if possible.
+   * this won't last long as long as input is enabled.
+   */
+  void do_duck();
+
+  /**
+   * stand back up if possible.
+   */
+  void do_standup();
+
+  /**
+   * do a backflip if possible.
+   */
+  void do_backflip();
+
+  /**
+   * jump in the air if possible
+   * sensible values for yspeed are negative - unless we want to jump into the ground of course
+   */
+  void do_jump(float yspeed);
+
+  /**
    * Adds velocity to the player (be carefull when using this)
    */
   void add_velocity(const Vector& velocity);
@@ -189,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);
@@ -209,9 +255,9 @@ 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();
 
@@ -219,6 +265,11 @@ private:
   void deactivate();
   void walk(float speed);
 
+  /**
+   * slows Tux down a little, based on where he's standing
+   */
+  void apply_friction();
+
   bool visible;
 
   Portable* grabbed_object;
@@ -226,7 +277,10 @@ private:
   Sprite* smalltux_gameover;
   Sprite* smalltux_star;
   Sprite* bigtux_star;
+
   Vector floor_normal;
+  bool try_grab;
+  Direction grab_dir;
 
   bool ghost_mode; /**< indicates if Tux should float around and through solid objects */