- Added Gez's AMMO_CHECKBOTH submission.

SVN r1627 (trunk)
This commit is contained in:
Christoph Oelckers 2009-05-31 22:14:23 +00:00
commit 91e0f4d11d
4 changed files with 4 additions and 2 deletions

View file

@ -438,7 +438,7 @@ bool AWeapon::CheckAmmo (int fireMode, bool autoSwitch, bool requireAmmo)
{ // If this weapon has no alternate fire, then there is never enough ammo for it
enough &= 1;
}
if ((enough & enoughmask) == enoughmask)
if (((enough & enoughmask) == enoughmask) || (enough && (WeaponFlags & WIF_AMMO_CHECKBOTH)))
{
return true;
}