Skip to content

Commit

Permalink
Fix not equipping fists when picking up 2nd berserk
Browse files Browse the repository at this point in the history
  • Loading branch information
bradharding committed Aug 8, 2024
1 parent 62e664d commit c464d20
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions src/p_inter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit c464d20

Please sign in to comment.