zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-11 13:11:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into scripting

Browse source
This commit is contained in:
Christoph Oelckers 2015-05-05 11:24:43 +02:00
commit bfc10f4c5e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_pspr.cpp
View file

@ -207,10 +207,10 @@ void P_BringUpWeapon (player_t *player)
player->ReadyWeapon = weapon; player->ReadyWeapon = weapon;
player->psprites[ps_weapon].sy = player->cheats & CF_INSTANTWEAPSWITCH player->psprites[ps_weapon].sy = player->cheats & CF_INSTANTWEAPSWITCH
? WEAPONTOP : WEAPONBOTTOM; ? WEAPONTOP : WEAPONBOTTOM;
P_SetPsprite (player, ps_weapon, newstate);
// make sure that the previous weapon's flash state is terminated. // make sure that the previous weapon's flash state is terminated.
// When coming here from a weapon drop it may still be active. // When coming here from a weapon drop it may still be active.
P_SetPsprite(player, ps_flash, NULL); P_SetPsprite(player, ps_flash, NULL);
P_SetPsprite (player, ps_weapon, newstate);
player->mo->weaponspecial = 0; player->mo->weaponspecial = 0;
} }