From 261bc778467ac07657b35ca92e0d0f69a092a32e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 20 May 2014 10:29:27 +0200 Subject: [PATCH] - fixed: when bringing up a new weapon the current flash state needs to be removed. Especially when dropping the current weapon it can still be active, this is most easily observed with Strife's crossbow which loops the flash state, but it also can happen with other weapons, right after shooting. --- src/p_pspr.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 85830ac55..49f8bcb84 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -208,6 +208,9 @@ void P_BringUpWeapon (player_t *player) 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); }