From 7856dac3bbd140116156839dce7c3e0a7ae96e45 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Fri, 15 Jul 2022 10:15:17 +0200 Subject: [PATCH] boom autoswitch: don't replace pending weapon choice (#665) Thanks @kraflab --- src/g_game.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/g_game.c b/src/g_game.c index e5ebcbb2..943b66df 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -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;