Removed trailing whitespace from all *.?pp files

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

diff --git a/src/object/player.hpp b/src/object/player.hpp
index 7430fc9..3dda1fd 100644 (file)
--- a/src/object/player.hpp
+++ b/src/object/player.hpp
@@ -18,6 +18,7 @@
 #define HEADER_SUPERTUX_OBJECT_PLAYER_HPP
 
 #include "scripting/player.hpp"
+#include "sprite/sprite_ptr.hpp"
 #include "supertux/direction.hpp"
 #include "supertux/moving_object.hpp"
 #include "supertux/physic.hpp"
@@ -30,7 +31,6 @@ class Portable;
 class Climbable;
 class Controller;
 class CodeController;
-class Sprite;
 class Surface;
 class Timer;
 
@@ -40,61 +40,21 @@ static const float TUX_INVINCIBLE_TIME = 14.0f;
 static const float TUX_INVINCIBLE_TIME_WARNING = 2.0f;
 static const float GROWING_TIME = 0.35f;
 static const int GROWING_FRAMES = 7;
+static const float TUX_BACKFLIP_TIME = 2.1f; // minimum air time that backflip results in a loss of control
 
 class Camera;
 class PlayerStatus;
 
-class Player : public MovingObject, 
-               public Scripting::Player, 
+class Player : public MovingObject,
+               public scripting::Player,
                public ScriptInterface
 {
 public:
   enum FallMode { ON_GROUND, JUMPING, TRAMPOLINE_JUMP, FALLING };
-
-  Controller* controller;
-  std::auto_ptr<CodeController> scripting_controller; /**< This controller is used when the Player is controlled via scripting */
-  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 peekingX, peekingY;
-  bool swimming;
-  float speedlimit;
-  Controller* scripting_controller_old; /**< Saves the old controller while the scripting_controller is used */
-  bool jump_early_apex;
-  bool on_ice;
-  bool ice_this_frame;
-
-public:
-  Direction dir;
-  Direction old_dir;
-
-  float last_ground_y;
-  FallMode fall_mode;
-
-  bool on_ground_flag;
-  bool jumping;
-  bool can_jump;
-  Timer jump_button_timer; /**< started when player presses the jump button; runs until Tux jumps or JUMP_GRACE_TIME runs out */
-  bool wants_buttjump;
-  bool does_buttjump;
-
-  Timer invincible_timer;
-  Timer skidding_timer;
-  Timer safe_timer;
-  Timer kick_timer;
-  Timer shooting_timer;   // used to show the arm when Tux is shooting
-  Timer dying_timer;
-  bool growing;
-  Timer backflip_timer;
-
 public:
   Player(PlayerStatus* player_status, const std::string& name);
   virtual ~Player();
@@ -103,6 +63,15 @@ public:
   virtual void unexpose(HSQUIRRELVM vm, SQInteger table_idx);
 
   void set_controller(Controller* controller);
+  /*
+   * Level solved. Don't kill Tux any more.
+   */
+  void set_winning();
+  bool is_winning()
+  {
+    return winning;
+  }
+
   Controller* get_controller()
   {
     return controller;
@@ -137,7 +106,7 @@ public:
   }
 
   void kill(bool completely);
-  void check_bounds(Camera* camera);
+  void check_bounds();
   void move(const Vector& vector);
 
   virtual bool add_bonus(const std::string& bonus);
@@ -200,7 +169,7 @@ public:
    * Adds velocity to the player until given end speed is reached
    */
   void add_velocity(const Vector& velocity, const Vector& end_speed);
-  
+
   /**
    * Returns the current velocity of the player
    */
@@ -253,7 +222,7 @@ 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
    */
@@ -270,7 +239,6 @@ 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();
 
@@ -280,6 +248,7 @@ private:
   void activate();
   void deactivate();
   void walk(float speed);
+  void set_dir(bool right);
 
   void do_jump_apex();
   void early_jump_apex();
@@ -290,17 +259,63 @@ private:
   void apply_friction();
 
 private:
+  bool deactivated;
+
+  Controller* controller;
+  std::unique_ptr<CodeController> scripting_controller; /**< This controller is used when the Player is controlled via scripting */
+  PlayerStatus* player_status;
+  bool duck;
+  bool dead;
+
+private:
+  bool dying;
+  bool winning;
+  bool backflipping;
+  int  backflip_direction;
+  Direction peekingX;
+  Direction peekingY;
+  bool swimming;
+  float speedlimit;
+  Controller* scripting_controller_old; /**< Saves the old controller while the scripting_controller is used */
+  bool jump_early_apex;
+  bool on_ice;
+  bool ice_this_frame;
+
+public:
+  Direction dir;
+  Direction old_dir;
+
+  float last_ground_y;
+  FallMode fall_mode;
+
+  bool on_ground_flag;
+  bool jumping;
+  bool can_jump;
+  Timer jump_button_timer; /**< started when player presses the jump button; runs until Tux jumps or JUMP_GRACE_TIME runs out */
+  bool wants_buttjump;
+  bool does_buttjump;
+
+  Timer invincible_timer;
+  Timer skidding_timer;
+  Timer safe_timer;
+  Timer kick_timer;
+  Timer shooting_timer;   // used to show the arm when Tux is shooting
+  Timer dying_timer;
+  bool growing;
+  Timer backflip_timer;
+
   Physic physic;
 
   bool visible;
 
   Portable* grabbed_object;
 
-  std::auto_ptr<Sprite> sprite; /**< The main sprite representing Tux */
+  SpritePtr sprite; /**< The main sprite representing Tux */
 
-  std::auto_ptr<Surface> airarrow; /**< arrow indicating Tux' position when he's above the camera */
+  SurfacePtr airarrow; /**< arrow indicating Tux' position when he's above the camera */
 
   Vector floor_normal;
+  void position_grabbed_object();
   void try_grab();
 
   bool ghost_mode; /**< indicates if Tux should float around and through solid objects */