projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Yet another try in the endless quest for perfect collision detection.
[supertux.git]
/
src
/
object
/
player.hpp
diff --git
a/src/object/player.hpp
b/src/object/player.hpp
index
fa4b80f
..
add9a09
100644
(file)
--- a/
src/object/player.hpp
+++ b/
src/object/player.hpp
@@
-92,8
+92,8
@@
private:
bool dying;
bool backflipping;
int backflip_direction;
bool dying;
bool backflipping;
int backflip_direction;
+
public:
public:
-
Direction dir;
Direction old_dir;
Direction dir;
Direction old_dir;
@@
-104,7
+104,7
@@
public:
bool jumping;
bool can_jump;
bool butt_jump;
bool jumping;
bool can_jump;
bool butt_jump;
-
+
Timer invincible_timer;
Timer skidding_timer;
Timer safe_timer;
Timer invincible_timer;
Timer skidding_timer;
Timer safe_timer;
@@
-148,6
+148,11
@@
public:
// set kick animation
void kick();
// set kick animation
void kick();
+ /**
+ * Adds velocity to the player (be carefull when using this)
+ */
+ void add_velocity(const Vector& velocity);
+
void bounce(BadGuy& badguy);
bool is_dead() const
void bounce(BadGuy& badguy);
bool is_dead() const
@@
-173,11
+178,14
@@
private:
bool visible;
bool visible;
+ float adjust_height;
+
Portable* grabbed_object;
Sprite* smalltux_gameover;
Sprite* smalltux_star;
Sprite* bigtux_star;
Portable* grabbed_object;
Sprite* smalltux_gameover;
Sprite* smalltux_star;
Sprite* bigtux_star;
+ Vector floor_normal;
};
#endif /*SUPERTUX_PLAYER_H*/
};
#endif /*SUPERTUX_PLAYER_H*/