From 4950069cd6b83de6c5e714c48eb8bdb0930f04bf Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sun, 18 May 2025 14:18:06 -0400 Subject: [PATCH] Fix other minor issues brought up Thanks again Jon --- src/k_kart.c | 2 +- src/p_inter.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 1cbddb76f..d71a74fd7 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10061,7 +10061,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) player->itemflags &= ~IF_USERINGS; } - if (player && player->mo && player->mo->health > 0 && !player->spectator && !P_PlayerInPain(player) && player->respawn == 0 && !(player->exiting || mapreset) && leveltime > introtime) + if (player && player->mo && player->mo->health > 0 && !player->spectator && !P_PlayerInPain(player) && player->respawn == 0 && !(player->exiting || mapreset)) { // First, the really specific, finicky items that function without the item being directly in your item slot. { diff --git a/src/p_inter.c b/src/p_inter.c index d9ff7d555..5a816d52f 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2156,6 +2156,12 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da if (player->pflags & PF_GODMODE) return false; + if (player->exiting) + { + K_DoInstashield(player); + return false; + } + if (!force) { // Player hits another player