From 08730b941b0414a7f000b4067b6a4e6368bf4225 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Thu, 2 Apr 2009 01:48:59 +0000 Subject: [PATCH] - Fixed: SBARINFO's "usessecondaryammo" considered a weapon to not use secondaryammo if ammo2's type was the same as ammo1's, but only if you didn't use the "not" keyword with it. SVN r1515 (trunk) --- docs/rh-log.txt | 7 ++++++- src/g_shared/sbarinfo_display.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 9f444321c..f71838e7b 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,9 @@ -March 29, 2009 (Changes by Graf Zahl) +April 1, 2008 +- Fixed: SBARINFO's "usessecondaryammo" considered a weapon to not use + secondaryammo if ammo2's type was the same as ammo1's, but only if you + didn't use the "not" keyword with it. + +March 29, 2009 (Changes by Graf Zahl) - Fixed: Altering a link type with Sector_SetLink did not work. - Fixed: player.crouchsprite had no proper means of unsetting the crouch sprite which is needed by the ChexPlayer. diff --git a/src/g_shared/sbarinfo_display.cpp b/src/g_shared/sbarinfo_display.cpp index 702e38682..aac681b8e 100644 --- a/src/g_shared/sbarinfo_display.cpp +++ b/src/g_shared/sbarinfo_display.cpp @@ -1288,7 +1288,7 @@ void DSBarInfo::doCommands(SBarInfoBlock &block, int xOffset, int yOffset, int a break; case SBARINFO_USESSECONDARYAMMO: if((CPlayer->ReadyWeapon != NULL && CPlayer->ReadyWeapon->AmmoType2 != NULL && CPlayer->ReadyWeapon->AmmoType2 != CPlayer->ReadyWeapon->AmmoType1 && !(cmd.flags & SBARINFOEVENT_NOT)) || - ((CPlayer->ReadyWeapon == NULL || CPlayer->ReadyWeapon->AmmoType2 == NULL) && cmd.flags & SBARINFOEVENT_NOT)) + ((CPlayer->ReadyWeapon == NULL || CPlayer->ReadyWeapon->AmmoType2 == NULL || CPlayer->ReadyWeapon->AmmoType2 == CPlayer->ReadyWeapon->AmmoType1) && cmd.flags & SBARINFOEVENT_NOT)) { doCommands(cmd.subBlock, xOffset, yOffset, alpha); }