From cdfd671dffc7b3941ad5bae3f83e7c35caf6e2b0 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Thu, 7 Feb 2013 20:42:24 +0000
Subject: [PATCH] - P_MovePsprites() should now always call
 P_CheckWeaponSwitch(), because the latter function   now has its own
 WF_WEAPONSWITCHOK check in the correct place.

SVN r4068 (trunk)
---
 src/p_pspr.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp
index 1b4e0b55ad..6a2176458b 100644
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@@ -1072,10 +1072,7 @@ void P_MovePsprites (player_t *player)
 		}
 		player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
 		player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
-		if (player->WeaponState & WF_WEAPONSWITCHOK)
-		{
-			P_CheckWeaponSwitch (player);
-		}
+		P_CheckWeaponSwitch (player);
 		if (player->WeaponState & (WF_WEAPONREADY | WF_WEAPONREADYALT))
 		{
 			P_CheckWeaponFire (player);