boom autoswitch: don't replace pending weapon choice (#665)

Thanks @kraflab
This commit is contained in:
Fabian Greffrath 2022-07-15 10:15:17 +02:00 committed by GitHub
parent 6b37797a53
commit 7856dac3bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -460,7 +460,8 @@ void G_BuildTiccmd(ticcmd_t* cmd)
if ((!demo_compatibility && players[consoleplayer].attackdown &&
!P_CheckAmmo(&players[consoleplayer]) &&
((boom_weapon_state_injection && !done_autoswitch) || cmd->buttons & BT_ATTACK)) ||
((boom_weapon_state_injection && !done_autoswitch) ||
(cmd->buttons & BT_ATTACK && players[consoleplayer].pendingweapon == wp_nochange))) ||
M_InputGameActive(input_weapontoggle))
{
done_autoswitch = true;