mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-26 14:33:46 -04:00
boom autoswitch: don't replace pending weapon choice (#665)
Thanks @kraflab
This commit is contained in:
parent
6b37797a53
commit
7856dac3bb
@ -460,7 +460,8 @@ void G_BuildTiccmd(ticcmd_t* cmd)
|
|||||||
|
|
||||||
if ((!demo_compatibility && players[consoleplayer].attackdown &&
|
if ((!demo_compatibility && players[consoleplayer].attackdown &&
|
||||||
!P_CheckAmmo(&players[consoleplayer]) &&
|
!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))
|
M_InputGameActive(input_weapontoggle))
|
||||||
{
|
{
|
||||||
done_autoswitch = true;
|
done_autoswitch = true;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user