Merge branch 'hell-respawn' into 'master'

Kill players who respawn at lethal threshold

Closes #1663

See merge request kart-krew-dev/ring-racers-internal!2900
This commit is contained in:
AJ Martinez 2025-09-26 17:57:10 +00:00
commit bd4b3336bf

View file

@ -176,6 +176,12 @@ void K_DoIngameRespawn(player_t *player)
K_DoFault(player); K_DoFault(player);
} }
if (player->rings <= -20 && !player->respawn.fromRingShooter)
{
P_KillMobj(player->mo, NULL, NULL, DMG_INSTAKILL);
return;
}
player->ringboost = 0; player->ringboost = 0;
player->driftboost = player->strongdriftboost = 0; player->driftboost = player->strongdriftboost = 0;
player->gateBoost = 0; player->gateBoost = 0;
@ -740,7 +746,7 @@ static void K_DropDashWait(player_t *player)
player->respawn.timer--; player->respawn.timer--;
if (player->pflags & PF_FAULT) if (player->pflags & PF_FAULT)
return; return;
if (leveltime % 8 == 0) if (leveltime % 8 == 0)
{ {