projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only draw Tux' arm in front of other objects if he's actually holding something ...
[supertux.git]
/
src
/
object
/
player.hpp
diff --git
a/src/object/player.hpp
b/src/object/player.hpp
index
fec7007
..
f27decd
100644
(file)
--- a/
src/object/player.hpp
+++ b/
src/object/player.hpp
@@
-39,12
+39,13
@@
class BadGuy;
class Portable;
class BadGuy;
class Portable;
+class Climbable;
/* Times: */
/* 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.8
f
;
+static const float TUX_INVINCIBLE_TIME = 10.0
f
;
+static const float TUX_INVINCIBLE_TIME_WARNING = 2.0
f
;
+static const float GROWING_TIME = 0.35
f
;
static const int GROWING_FRAMES = 7;
class Camera;
static const int GROWING_FRAMES = 7;
class Camera;
@@
-68,7
+69,7
@@
public:
void set_action(std::string action, int loops = -1);
void one_time_animation();
void set_action(std::string action, int loops = -1);
void one_time_animation();
- void draw(DrawingContext& context, const Vector& pos, int layer);
+ void draw(DrawingContext& context, const Vector& pos, int layer
, Portable* grabbed_object
);
Sprite* head;
Sprite* body;
Sprite* head;
Sprite* body;
@@
-90,6
+91,9
@@
public:
PlayerStatus* player_status;
bool duck;
bool dead;
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;
private:
bool dying;
@@
-97,6
+101,7
@@
private:
int backflip_direction;
Direction peeking;
bool swimming;
int backflip_direction;
Direction peeking;
bool swimming;
+ float speedlimit;
public:
Direction dir;
public:
Direction dir;
@@
-255,10
+260,21
@@
public:
* Orders the current GameSession to start a sequence
*/
void trigger_sequence(std::string sequence_name);
* Orders the current GameSession to start a sequence
*/
void trigger_sequence(std::string sequence_name);
+
+ /**
+ * Requests that the player start climbing the given Climbable
+ */
+ void start_climbing(Climbable& climbable);
+
+ /**
+ * Requests that the player stop climbing the given Climbable
+ */
+ void stop_climbing(Climbable& climbable);
private:
void handle_input();
void handle_input_ghost(); /**< input handling while in ghost mode */
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();
bool deactivated;
void init();
@@
-291,6
+307,8
@@
private:
bool ghost_mode; /**< indicates if Tux should float around and through solid objects */
Timer unduck_hurt_timer; /**< if Tux wants to stand up again after ducking and cannot, this timer is started */
bool ghost_mode; /**< indicates if Tux should float around and through solid objects */
Timer unduck_hurt_timer; /**< if Tux wants to stand up again after ducking and cannot, this timer is started */
+
+ Climbable* climbing; /**< Climbable object we are currently climbing, null if none */
};
#endif /*SUPERTUX_PLAYER_H*/
};
#endif /*SUPERTUX_PLAYER_H*/