add code to debug collision rectangles

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

diff --git a/src/object/player.hpp b/src/object/player.hpp
index 1ec6397..d16f536 100644 (file)
--- a/src/object/player.hpp
+++ b/src/object/player.hpp
@@ -31,6 +31,10 @@
 #include "control/controller.hpp"
 #include "scripting/player.hpp"
 #include "player_status.hpp"
+#include "display_effect.hpp"
+#include "script_interface.hpp"
+#include "console.hpp"
+#include "coin.hpp"
 
 class BadGuy;
 class Portable;
@@ -76,7 +80,21 @@ extern TuxBodyParts* big_tux;
 extern TuxBodyParts* fire_tux;
 extern TuxBodyParts* ice_tux;
 
-class Player : public MovingObject, public Scripting::Player
+class FallingCoin : public GameObject
+{
+public:
+  FallingCoin(const Vector& start_position, const int x_vel);
+  ~FallingCoin();
+
+  void draw(DrawingContext& context);
+  void update(float elapsed_time);
+private:
+  Vector  pos;
+  Sprite* sprite;
+  Physic  physic;
+};
+
+class Player : public MovingObject, public Scripting::Player, public ScriptInterface
 {
 public:
   enum HurtMode { KILL, SHRINK };
@@ -91,8 +109,8 @@ private:
   bool dying;
   bool backflipping;
   int  backflip_direction;
+  
 public:
-
   Direction dir;
   Direction old_dir;
 
@@ -103,7 +121,7 @@ public:
   bool jumping;
   bool can_jump;
   bool butt_jump;
-  
+
   Timer invincible_timer;
   Timer skidding_timer;
   Timer safe_timer;
@@ -119,11 +137,15 @@ public:
   Player(PlayerStatus* player_status);
   virtual ~Player();
 
+  virtual void expose(HSQUIRRELVM vm, int table_idx);
+  virtual void unexpose(HSQUIRRELVM vm, int table_idx);
+
   void set_controller(Controller* controller);  
 
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
+  virtual void collision_tile(uint32_t tile_attributes);
 
   void make_invincible();
   bool is_invincible() const
@@ -138,21 +160,35 @@ public:
   void kill(HurtMode mode);
   void check_bounds(Camera* camera);
   void move(const Vector& vector);
+
+  virtual void set_bonus(const std::string& bonus);
+  virtual void add_coins(int count);
   void set_bonus(BonusType type, bool animate = false);
   PlayerStatus* get_status()
   {
     return player_status;
   }
+  // set kick animation
+  void kick();
+
+  /**
+   * Adds velocity to the player (be carefull when using this)
+   */
+  void add_velocity(const Vector& velocity);
 
   void bounce(BadGuy& badguy);
 
   bool is_dead() const
   { return dead; }
   bool is_big();
-  
+
+  void set_visible(bool visible);
+  bool get_visible();
+
+  bool on_ground();
+
 private:
   void handle_input();
-  bool on_ground();
   bool deactivated;
   
   void init();
@@ -164,11 +200,16 @@ private:
   void deactivate();
   void walk(float speed);
 
+  bool visible;
+
+  float adjust_height;
+
   Portable* grabbed_object;
 
   Sprite* smalltux_gameover;
   Sprite* smalltux_star;
   Sprite* bigtux_star;
+  Vector floor_normal;
 };
 
 #endif /*SUPERTUX_PLAYER_H*/