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
0897674
..
e76b93b
100644
(file)
--- a/
src/player.h
+++ b/
src/player.h
@@
-40,6
+40,7
@@
class BadGuy;
#define TUX_SAFE_TIME 1250
#define TUX_INVINCIBLE_TIME 10000
#define TUX_INVINCIBLE_TIME_WARNING 2000
#define TUX_SAFE_TIME 1250
#define TUX_INVINCIBLE_TIME 10000
#define TUX_INVINCIBLE_TIME_WARNING 2000
+#define TUX_FLAPPING_TIME 1000 /* How long Tux can flap his wings to gain additional jump height */
#define TIME_WARNING 20000 /* When to alert player they're low on time! */
/* One-ups... */
#define TIME_WARNING 20000 /* When to alert player they're low on time! */
/* One-ups... */
@@
-49,7
+50,7
@@
class BadGuy;
/* Scores: */
#define SCORE_BRICK 5
/* Scores: */
#define SCORE_BRICK 5
-#define SCORE_DISTRO 2
5
+#define SCORE_DISTRO 2
0
/* Sizes: */
/* Sizes: */
@@
-62,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();
};
@@
-78,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);
@@
-147,10
+149,23
@@
public:
FallMode fall_mode;
bool jumping;
FallMode fall_mode;
bool jumping;
+ bool flapping;
bool can_jump;
bool can_jump;
+ bool can_flap;
+ bool falling_from_flap;
+ bool enable_hover;
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;
@@
-162,6
+177,7
@@
public:
Timer dying_timer;
Timer growing_timer;
Timer idle_timer;
Timer dying_timer;
Timer growing_timer;
Timer idle_timer;
+ Timer flapping_timer;
Physic physic;
public:
Physic physic;
public: