zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 12:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: SBARINFO's "usessecondaryammo" considered a weapon to not use

Browse source 
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)
This commit is contained in:
Randy Heit 2009-04-02 01:48:59 +00:00
parent f62fcabb9c
commit 08730b941b
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/rh-log.txt
View file

@ -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: Altering a link type with Sector_SetLink did not work.
- Fixed: player.crouchsprite had no proper means of unsetting the crouch - Fixed: player.crouchsprite had no proper means of unsetting the crouch
sprite which is needed by the ChexPlayer. sprite which is needed by the ChexPlayer.

2
src/g_shared/sbarinfo_display.cpp
View file

@ -1288,7 +1288,7 @@ void DSBarInfo::doCommands(SBarInfoBlock &block, int xOffset, int yOffset, int a
break; break;
case SBARINFO_USESSECONDARYAMMO: case SBARINFO_USESSECONDARYAMMO:
if((CPlayer->ReadyWeapon != NULL && CPlayer->ReadyWeapon->AmmoType2 != NULL && CPlayer->ReadyWeapon->AmmoType2 != CPlayer->ReadyWeapon->AmmoType1 && !(cmd.flags & SBARINFOEVENT_NOT)) || 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); doCommands(cmd.subBlock, xOffset, yOffset, alpha);
} }