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

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

View File

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