Do a black fade-in when selecting slot.

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 21a00a2..78c22d9 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -24,11 +24,10 @@
 #include "bitmask.h"
 #include "type.h"
 #include "timer.h"
-#include "texture.h"
+#include "screen/texture.h"
 #include "collision.h"
 #include "sound.h"
 #include "moving_object.h"
-#include "drawable.h"
 #include "physic.h"
 
 /* Times: */
@@ -53,6 +52,7 @@ struct PlayerKeymap
 {
 public:
   int jump;
+  int activate;
   int duck;
   int left;
   int right;
@@ -72,11 +72,13 @@ struct player_input_type
   int down;
   int fire;
   int old_fire;
+  int activate;
 };
 
 void player_input_init(player_input_type* pplayer_input);
 
 class Sprite;
+class Camera;
 
 extern Surface* tux_life;
 
@@ -109,7 +111,7 @@ extern PlayerSprite largetux;
 extern PlayerSprite firetux;
 extern PlayerSprite icetux;
 
-class Player : public MovingObject, public Drawable
+class Player : public MovingObject
 {
 public:
   enum HurtMode { KILL, SHRINK };
@@ -148,7 +150,7 @@ public:
   Physic physic;
 
 public:
-  Player(DisplayManager& display_manager);
+  Player();
   virtual ~Player();
   
   int  key_event(SDLKey key, int state);
@@ -157,14 +159,14 @@ public:
   void grabdistros();
 
   virtual void action(float elapsed_time);
-  virtual void draw(Camera& viewport, int layer);
+  virtual void draw(DrawingContext& context);
   virtual void collision(const MovingObject& other_object,
       int collision_type);
 
   void collision(void* p_c_object, int c_object);
   void kill(HurtMode mode);
   void player_remove_powerups();
-  void check_bounds(Camera& viewport);
+  void check_bounds(Camera* camera);
   bool on_ground();
   bool under_solid();
   bool tiles_on_air(int tiles);