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
d2b7e07
..
e76b93b
100644
(file)
--- a/
src/player.h
+++ b/
src/player.h
@@
-63,11
+63,11
@@
struct PlayerKeymap
{
public:
int jump;
{
public:
int jump;
- int
activate
;
- int d
uck
;
+ int
up
;
+ int d
own
;
int left;
int right;
int left;
int right;
- int
fire
;
+ int
power
;
PlayerKeymap();
};
PlayerKeymap();
};
@@
-79,11
+79,12
@@
struct player_input_type
int right;
int left;
int up;
int right;
int left;
int up;
- int old_up;
int down;
int fire;
int old_fire;
int activate;
int down;
int fire;
int old_fire;
int activate;
+ int jump;
+ int old_jump;
};
void player_input_init(player_input_type* pplayer_input);
};
void player_input_init(player_input_type* pplayer_input);
@@
-156,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;