From 1c999d9d55d97457886d8dd66f179345be27a653 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Fri, 25 Jan 2013 03:25:32 +0000 Subject: [PATCH] - Be more concise for WRF_NoFire in A_WeaponReady. SVN r4043 (trunk) --- src/p_pspr.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 24f202a57..46d31ab39 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -566,9 +566,8 @@ DEFINE_ACTION_FUNCTION_PARAMS(AInventory, A_WeaponReady) ACTION_PARAM_INT(paramflags, 0); if (!(paramflags & WRF_NoSwitch)) DoReadyWeaponToSwitch(self); - if ((paramflags & WRF_NoFire) != WRF_NoFire) DoReadyWeaponToFire(self, - (!(paramflags & WRF_NoPrimary)), (!(paramflags & WRF_NoSecondary))); - if (!(paramflags & WRF_NoBob)) DoReadyWeaponToBob(self); + if (!(paramflags & WRF_NoFire)) DoReadyWeaponToFire(self, !(paramflags & WRF_NoPrimary), !(paramflags & WRF_NoSecondary)); + if (!(paramflags & WRF_NoBob)) DoReadyWeaponToBob(self); if ((paramflags & WRF_AllowReload)) DoReadyWeaponToReload(self); if ((paramflags & WRF_AllowZoom)) DoReadyWeaponToZoom(self); }