mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-05-10 19:01:50 +00:00
Always sync health to bumpers in P_KillPlayer
Fixes Death Pit respawning in Battle.
This commit is contained in:
parent
a55ddef528
commit
b8a503f56a
1 changed files with 3 additions and 3 deletions
|
|
@ -1934,13 +1934,12 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
K_DestroyBumpers(player, 1);
|
|
||||||
|
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
case DMG_DEATHPIT:
|
case DMG_DEATHPIT:
|
||||||
// Respawn kill types
|
// Respawn kill types
|
||||||
K_DoIngameRespawn(player);
|
K_DoIngameRespawn(player);
|
||||||
|
player->mo->health -= K_DestroyBumpers(player, 1);
|
||||||
return false;
|
return false;
|
||||||
case DMG_SPECTATOR:
|
case DMG_SPECTATOR:
|
||||||
// disappearifies, but still gotta put items back in play
|
// disappearifies, but still gotta put items back in play
|
||||||
|
|
@ -1997,10 +1996,11 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
|
||||||
P_SetTarget(&boom->target, player->mo);
|
P_SetTarget(&boom->target, player->mo);
|
||||||
}
|
}
|
||||||
|
|
||||||
K_DestroyBumpers(player, player->bumpers);
|
|
||||||
player->pflags |= PF_ELIMINATED;
|
player->pflags |= PF_ELIMINATED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
K_DestroyBumpers(player, player->bumpers);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue