From 714f04c93095dd8fbc7f9ea32ae081fd4bd820f5 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 27 Oct 2020 01:09:51 -0400 Subject: [PATCH] Eliminate karma players at overtime --- src/k_kart.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/k_kart.c b/src/k_kart.c index bbdc62e82..bee2e88d9 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2451,6 +2451,11 @@ void K_RemoveBumper(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8 a karmahitbox->destscale = player->mo->scale; P_SetScale(karmahitbox, player->mo->scale); CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]); + + if (battleovertime.enabled > 0) + { + player->eliminated = true; + } } player->bumpers -= amount; @@ -5740,6 +5745,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) } else if (player->karmadelay > 0 && !P_PlayerInPain(player)) { + if (battleovertime.enabled > 0) + { + player->eliminated = true; + } + player->karmadelay--; if (P_IsDisplayPlayer(player) && player->bumpers <= 0 && player->karmadelay <= 0) comebackshowninfo = true; // client has already seen the message