projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed level editor crash (a hack)
[supertux.git]
/
src
/
player.h
diff --git
a/src/player.h
b/src/player.h
index
6852ebc
..
21a00a2
100644
(file)
--- a/
src/player.h
+++ b/
src/player.h
@@
-83,6
+83,8
@@
extern Surface* tux_life;
extern Sprite* smalltux_gameover;
extern Sprite* smalltux_star;
extern Sprite* largetux_star;
extern Sprite* smalltux_gameover;
extern Sprite* smalltux_star;
extern Sprite* largetux_star;
+extern Sprite* growingtux_left;
+extern Sprite* growingtux_right;
struct PlayerSprite
{
struct PlayerSprite
{
@@
-142,6
+144,7
@@
public:
Timer kick_timer;
Timer shooting_timer; // used to show the arm when Tux is shooting
Timer dying_timer;
Timer kick_timer;
Timer shooting_timer; // used to show the arm when Tux is shooting
Timer dying_timer;
+ Timer growing_timer;
Physic physic;
public:
Physic physic;
public:
@@
-161,11
+164,11
@@
public:
void collision(void* p_c_object, int c_object);
void kill(HurtMode mode);
void player_remove_powerups();
void collision(void* p_c_object, int c_object);
void kill(HurtMode mode);
void player_remove_powerups();
- void check_bounds(Camera& viewport
, bool back_scrolling, bool hor_autoscroll
);
+ void check_bounds(Camera& viewport);
bool on_ground();
bool under_solid();
bool tiles_on_air(int tiles);
bool on_ground();
bool under_solid();
bool tiles_on_air(int tiles);
- void grow();
+ void grow(
bool animate
);
void move(const Vector& vector);
bool is_dead() const
{ return dead; }
void move(const Vector& vector);
bool is_dead() const
{ return dead; }