projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- turned LEFT/RIGHT defines into enum, turned BadGuyModes into enum
[supertux.git]
/
src
/
player.cpp
diff --git
a/src/player.cpp
b/src/player.cpp
index
baedf12
..
7fb2206
100644
(file)
--- a/
src/player.cpp
+++ b/
src/player.cpp
@@
-702,18
+702,18
@@
Player::collision(void* p_c_object, int c_object)
/* Hurt player if he touches a badguy */
if (!pbad_c->dying && !dying &&
!safe_timer.started() &&
/* Hurt player if he touches a badguy */
if (!pbad_c->dying && !dying &&
!safe_timer.started() &&
- pbad_c->mode != HELD)
+ pbad_c->mode !=
BadGuy::
HELD)
{
{
- if (pbad_c->mode == FLAT && input.fire == DOWN)
+ if (pbad_c->mode ==
BadGuy::
FLAT && input.fire == DOWN)
{
{
- pbad_c->mode = HELD;
+ pbad_c->mode =
BadGuy::
HELD;
pbad_c->base.y-=8;
}
pbad_c->base.y-=8;
}
- else if (pbad_c->mode == FLAT)
+ else if (pbad_c->mode ==
BadGuy::
FLAT)
{
// Don't get hurt if we're kicking a flat badguy!
}
{
// Don't get hurt if we're kicking a flat badguy!
}
- else if (pbad_c->mode == KICK)
+ else if (pbad_c->mode ==
BadGuy::
KICK)
{
/* Hurt if you get hit by kicked laptop: */
if (!invincible_timer.started())
{
/* Hurt if you get hit by kicked laptop: */
if (!invincible_timer.started())