zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: it was no longer possible to set the flash state in the very first

Browse source 
weapon's state

This was due to an oversight in my first commit
This commit is contained in:
Leonard2 2016-05-27 22:31:18 +02:00
parent e6d89b9f71
commit 599fa7cfd1
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

@ -372,10 +372,10 @@ void P_BringUpWeapon (player_t *player)
player->ReadyWeapon = weapon; player->ReadyWeapon = weapon;
psweapon->y = player->cheats & CF_INSTANTWEAPSWITCH psweapon->y = player->cheats & CF_INSTANTWEAPSWITCH
? WEAPONTOP : WEAPONBOTTOM; ? WEAPONTOP : WEAPONBOTTOM;
psweapon->SetState(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, nullptr); P_SetPsprite(player, ps_flash, nullptr);
psweapon->SetState(newstate);
player->mo->weaponspecial = 0; player->mo->weaponspecial = 0;
} }