OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix Silver Bullet ignoring spare bullets on CheckAmmo

Browse source
This commit is contained in:
Mari the Deer 2020-09-07 14:53:57 +02:00
commit 39b2beda67
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
language.version
View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \cwGZ\c- r528 (Fri 4 Sep 20:26:50 CEST 2020)";
SWWM_MODVER="\chSWWM \cwGZ\c- r529 (Mon 7 Sep 14:53:57 CEST 2020)";

4
zscript/swwm_thiccboolet.zsc
View file

@ -623,7 +623,7 @@ Class SilverBullet : SWWMWeapon
override bool ReportHUDAmmo()
{
if ( (chambered && !fired) || (clipcount > 0) ) return true;
if ( (Ammo1.Amount <= 0) && (Ammo2.Amount <= 0) && (CountInv("SilverBullets") <= 0) && (CountInv("SilverBullets2") <= 0) ) return false;
if ( (Ammo1.Amount <= 0) && (Ammo2.Amount <= 0) && (Owner.CountInv("SilverBullets") <= 0) && (Owner.CountInv("SilverBullets2") <= 0) ) return false;
return true;
}
override bool CheckAmmo( int firemode, bool autoswitch, bool requireammo, int ammocount )
@ -634,7 +634,7 @@ Class SilverBullet : SWWMWeapon
// allow player to still use the zoom even if there's no ammo left
// (should work fine, assuming I've correctly interpreted the execution chain of all this stuff)
if ( autoswitch && (fireMode == AltFire) ) return true;
return ((chambered && !fired) || (clipcount > 0) || (Ammo1.Amount > 0) || (Ammo2.Amount > 0) || (CountInv("SilverBullets") > 0) || (CountInv("SilverBullets2") > 0));
return ((chambered && !fired) || (clipcount > 0) || (Ammo1.Amount > 0) || (Ammo2.Amount > 0) || (Owner.CountInv("SilverBullets") > 0) || (Owner.CountInv("SilverBullets2") > 0));
}
return Super.CheckAmmo(firemode,autoswitch,requireammo,ammocount);
}