X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=7fb22060530cd693b38fe23db24da29335295099;hb=63934f5f4c15f059c9b60499575870ebb7c923a0;hp=baedf1253178a1365477b470dcf947edae0080d2;hpb=b3c5f0ece37b618744a07ca52298e7e6da9f0d01;p=supertux.git diff --git a/src/player.cpp b/src/player.cpp index baedf1253..7fb220605 100644 --- 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() && - 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; } - else if (pbad_c->mode == FLAT) + else if (pbad_c->mode == BadGuy::FLAT) { // 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())