Fix flame shield not being remove on damage
This commit is contained in:
parent
ef11c55b41
commit
dd77d86d6f
1 changed files with 8 additions and 6 deletions
14
src/k_kart.c
14
src/k_kart.c
|
|
@ -5375,6 +5375,7 @@ void K_DropHnextList(player_t *player, boolean keepshields)
|
|||
break;
|
||||
case KSHIELD_FLAME:
|
||||
S_StartSound(player->mo, sfx_s3k47);
|
||||
player->flametimer = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -7017,12 +7018,6 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
|
|||
player->sneakertimer--;
|
||||
}
|
||||
|
||||
if (player->flamedash)
|
||||
player->flamedash--;
|
||||
|
||||
if (player->flamestore)
|
||||
player->flamestore--;
|
||||
|
||||
if (player->sneakertimer && player->wipeoutslow > 0 && player->wipeoutslow < wipeoutslowtime+1)
|
||||
player->wipeoutslow = wipeoutslowtime+1;
|
||||
|
||||
|
|
@ -7174,6 +7169,12 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
|
|||
player->bubblepop = 0;
|
||||
}
|
||||
|
||||
if (player->flamedash)
|
||||
player->flamedash--;
|
||||
|
||||
if (player->flamestore)
|
||||
player->flamestore--;
|
||||
|
||||
if (player->flametimer > 0)
|
||||
{
|
||||
if (player->stealingtimer == 0 && player->stolentimer == 0)
|
||||
|
|
@ -9207,6 +9208,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
|||
|
||||
if (player->flametimer <= 0)
|
||||
{
|
||||
player->flametimer = 0;
|
||||
S_StartSound(player->mo, sfx_s3k47);
|
||||
K_DropHnextList(player, false);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue