From cc1094394eb966401fd123f3f0e3425afa7bd882 Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Tue, 31 Aug 2021 19:50:12 +0200 Subject: [PATCH] Fix medikit message showing when medikit not picked up --- cgdoom/p_inter.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cgdoom/p_inter.c b/cgdoom/p_inter.c index 7642792..329d589 100644 --- a/cgdoom/p_inter.c +++ b/cgdoom/p_inter.c @@ -292,6 +292,7 @@ void P_TouchSpecialThing ( mobj_t* special, mobj_t* toucher ) player_t* player; int i; fixed_t delta; + int medikit_variant; //int sound; delta = special->z - toucher->z; @@ -422,12 +423,13 @@ void P_TouchSpecialThing ( mobj_t* special, mobj_t* toucher ) break; case SPR_MEDI: - if (player->health < 25) + medikit_variant = (player->health < 25); + if (!P_GiveBody (player, 25)) + return; + if (medikit_variant) player->message = GOTMEDINEED; else player->message = GOTMEDIKIT; - if (!P_GiveBody (player, 25)) - return; break;