From a2f55c8067ef989149908bddd2d2e734aa6b9505 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 27 Jan 2013 03:02:00 +0000 Subject: [PATCH] - Well, poo. WRF_NoFire is two bits, not just one. SVN r4054 (trunk) --- src/p_pspr.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 25c3e9645..8321daf28 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -552,10 +552,10 @@ void DoReadyWeapon(AActor * self) enum EWRF_Options { WRF_NoBob = 1, - WRF_NoFire = 12, WRF_NoSwitch = 2, WRF_NoPrimary = 4, WRF_NoSecondary = 8, + WRF_NoFire = WRF_NoPrimary + WRF_NoSecondary, WRF_AllowReload = 16, WRF_AllowZoom = 32, }; @@ -565,11 +565,11 @@ DEFINE_ACTION_FUNCTION_PARAMS(AInventory, A_WeaponReady) ACTION_PARAM_START(1); ACTION_PARAM_INT(paramflags, 0); - if (!(paramflags & WRF_NoSwitch)) DoReadyWeaponToSwitch(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); + 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_AllowReload)) DoReadyWeaponToReload(self); + if ((paramflags & WRF_AllowZoom)) DoReadyWeaponToZoom(self); } //---------------------------------------------------------------------------