From c81f1ff1cfed5ea4fc9d28dac5830b89a7006881 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 22 May 2021 00:36:45 +0200 Subject: [PATCH] Fix Dual Explodium guns being erroneously available with sv_infiniteammo. --- language.version | 4 ++-- zscript/weapons/swwm_splode.zsc | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/language.version b/language.version index 0b2d6a7ce..cb7834050 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r499 \cu(Fri 21 May 10:56:24 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r499 \cu(2021-05-21 10:56:24)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r500 \cu(Sat 22 May 00:36:45 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r500 \cu(2021-05-22 00:36:45)\c-"; diff --git a/zscript/weapons/swwm_splode.zsc b/zscript/weapons/swwm_splode.zsc index 6c94c2a9d..6e8610341 100644 --- a/zscript/weapons/swwm_splode.zsc +++ b/zscript/weapons/swwm_splode.zsc @@ -668,9 +668,7 @@ Class DualExplodiumGun : SWWMWeapon override bool CheckAmmo( int firemode, bool autoswitch, bool requireammo, int ammocount ) { - if ( (firemode == PrimaryFire) || (firemode == AltFire) ) - return (SisterWeapon&&(SisterWeapon.Amount > 1)); - return Super.CheckAmmo(firemode,autoswitch,requireammo,ammocount); + return (SisterWeapon&&(SisterWeapon.Amount > 1)); } override bool ReportHUDAmmo()