Fixed trailing whitespaces in all(?) source files of supertux, also fixed some svn...

[supertux.git] / src / object / player.hpp

diff --git a/src/object/player.hpp b/src/object/player.hpp
index bab2bc5..dc23f2f 100644 (file)
--- a/src/object/player.hpp
+++ b/src/object/player.hpp
@@ -41,10 +41,10 @@ class BadGuy;
 class Portable;
 
 /* Times: */
-static const float TUX_SAFE_TIME = 1.8;
-static const float TUX_INVINCIBLE_TIME = 10.0;
-static const float TUX_INVINCIBLE_TIME_WARNING = 2.0;
-static const float GROWING_TIME = 0.35;
+static const float TUX_SAFE_TIME = 1.8f;
+static const float TUX_INVINCIBLE_TIME = 10.0f;
+static const float TUX_INVINCIBLE_TIME_WARNING = 2.0f;
+static const float GROWING_TIME = 0.35f;
 static const int GROWING_FRAMES = 7;
 
 class Camera;
@@ -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 };
@@ -90,13 +90,18 @@ public:
   PlayerStatus* player_status;
   bool duck;
   bool dead;
+  //Tux can only go this fast. If set to 0 no special limit is used, only the default limits.
+  void set_speedlimit(float newlimit);
+  float get_speedlimit();
 
 private:
   bool dying;
   bool backflipping;
   int  backflip_direction;
   Direction peeking;
-  
+  bool swimming;
+  float speedlimit;
+
 public:
   Direction dir;
   Direction old_dir;
@@ -118,10 +123,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);
@@ -152,25 +156,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()
   {
@@ -179,7 +184,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.
    */
@@ -234,7 +239,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);
@@ -250,13 +255,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();
 
@@ -277,7 +287,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 */