mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 14:51:51 +00:00
- 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)
This commit is contained in:
parent
f62fcabb9c
commit
08730b941b
2 changed files with 7 additions and 2 deletions
|
@ -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.
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue