P_SetPsprite: check for readyweapon's upstate (#1157)

* P_SetPsprite: heck for any weapon's upstate or downstate

* limit number of choices

* check for readyweapon's upstate
This commit is contained in:
Fabian Greffrath 2023-07-26 19:22:52 +02:00 committed by GitHub
parent b5263a3619
commit 3229e9e4ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -80,9 +80,11 @@ static void P_SetPsprite(player_t *player, int position, statenum_t stnum)
if (position == ps_weapon)
{
if (stnum == weaponinfo[player->pendingweapon].upstate)
const weaponinfo_t wp = weaponinfo[player->readyweapon];
if (stnum == wp.upstate)
player->switching = weapswitch_raising;
else if (stnum == weaponinfo[player->readyweapon].downstate)
else if (stnum == wp.downstate)
player->switching = weapswitch_lowering;
}
}