From c464d201db5b67f558edc4e7d98da1189fc516ed Mon Sep 17 00:00:00 2001 From: Brad Harding Date: Thu, 8 Aug 2024 18:43:10 +1000 Subject: [PATCH] Fix not equipping fists when picking up 2nd berserk --- src/p_inter.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index dff66e837..9d8e622a0 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -999,16 +999,14 @@ bool P_TouchSpecialThing(mobj_t *special, const mobj_t *toucher, const bool mess if (message && !duplicate) HU_PlayerMessage(s_GOTBERSERK, true, false); - if (!strength) + if (viewplayer->readyweapon != wp_fist) { - if (viewplayer->readyweapon != wp_fist) - { - viewplayer->pendingweapon = wp_fist; - viewplayer->fistorchainsaw = wp_fist; - } + viewplayer->pendingweapon = wp_fist; + viewplayer->fistorchainsaw = wp_fist; + } + if (!strength) sound = sfx_getpow; - } break; }