From 468aa2ce5156ba87e97c2ac2f8cb40fdbbdd7284 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Fri, 16 Sep 2022 11:34:41 +0200 Subject: [PATCH] Screwups I missed. --- language.version | 4 ++-- zscript/weapons/swwm_baseweapon.zsc | 4 ++-- zscript/weapons/swwm_cbt.zsc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/language.version b/language.version index 8e67615bd..ee97bc6cb 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r467 \cu(Fri 16 Sep 11:31:26 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r467 \cu(2022-09-16 11:31:26)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r468 \cu(Fri 16 Sep 11:34:41 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r468 \cu(2022-09-16 11:34:41)\c-"; diff --git a/zscript/weapons/swwm_baseweapon.zsc b/zscript/weapons/swwm_baseweapon.zsc index 49f3c502e..505ad4525 100644 --- a/zscript/weapons/swwm_baseweapon.zsc +++ b/zscript/weapons/swwm_baseweapon.zsc @@ -10,7 +10,7 @@ Class SWWMWeapon : Weapon abstract bool tooltipsent; Class dropammotype; int dropamount; - private bool bInitialized; + bool bInitialized; Property Tooltip : tooltip; Property GetLine : getline; @@ -363,7 +363,7 @@ Class SWWMWeapon : Weapon abstract { // no weirdass factors or anything involved in this one // just simple and straightforward - if ( !ammotype ) return; + if ( !ammotype ) return null; let amo = Ammo(other.FindInventory(ammotype)); if ( !amo ) { diff --git a/zscript/weapons/swwm_cbt.zsc b/zscript/weapons/swwm_cbt.zsc index 92501f9fd..b9a2fd4f9 100644 --- a/zscript/weapons/swwm_cbt.zsc +++ b/zscript/weapons/swwm_cbt.zsc @@ -705,7 +705,7 @@ Class Wallbuster : SWWMWeapon { bool good = Super.PickupForAmmoSWWM(ownedWeapon); let Owner = ownedWeapon.Owner; - if ( (AmmoGive1 == 0) && initialized ) + if ( (AmmoGive1 == 0) && bInitialized ) { for ( int i=0; i<25; i++ ) {