From 535102ae6e376f89e1ee7df7508b05dabd7c35f6 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 5 May 2015 11:22:58 +0200 Subject: [PATCH] - fixed: NULLing the flash state in P_BringUpWeapon should be done before setting the main weapon state so that it doesn't cancel any flash state effects that get initiated there. --- src/p_pspr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 6e699a41b..63f3bc648 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -207,10 +207,10 @@ void P_BringUpWeapon (player_t *player) player->ReadyWeapon = weapon; player->psprites[ps_weapon].sy = player->cheats & CF_INSTANTWEAPSWITCH ? WEAPONTOP : WEAPONBOTTOM; - P_SetPsprite (player, ps_weapon, 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, NULL); + P_SetPsprite (player, ps_weapon, newstate); player->mo->weaponspecial = 0; }