projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed warnings
[supertux.git]
/
src
/
player.h
diff --git
a/src/player.h
b/src/player.h
index
b76022b
..
e76b93b
100644
(file)
--- a/
src/player.h
+++ b/
src/player.h
@@
-157,6
+157,15
@@
public:
bool butt_jump;
int frame_;
int frame_main;
bool butt_jump;
int frame_;
int frame_main;
+
+ float flapping_velocity;
+
+ // Ricardo's flapping
+ int flaps_nb;
+
+ // temporary to help player's choosing a flapping
+ enum { MAREK_FLAP, RICARDO_FLAP, RYAN_FLAP, NONE_FLAP };
+ int flapping_mode;
base_type previous_base;
Timer invincible_timer;
base_type previous_base;
Timer invincible_timer;