From f90fa5623489e05c170c0f0c3bb24b1e92f45cb7 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Fri, 29 Jul 2022 21:33:00 +0200 Subject: [PATCH] Fix crash when using items from menu. --- language.version | 4 ++-- zscript/kbase/swwm_kbasetab_inventory.zsc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index 40d5290cb..bd6ea648e 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r233 \cu(Fri 29 Jul 18:52:58 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r233 \cu(2022-07-29 18:52:58)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r234 \cu(Fri 29 Jul 21:33:00 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r234 \cu(2022-07-29 21:33:00)\c-"; diff --git a/zscript/kbase/swwm_kbasetab_inventory.zsc b/zscript/kbase/swwm_kbasetab_inventory.zsc index 4c2c30a55..7a9790310 100644 --- a/zscript/kbase/swwm_kbasetab_inventory.zsc +++ b/zscript/kbase/swwm_kbasetab_inventory.zsc @@ -527,8 +527,8 @@ Class DemolitionistMenuInvItem : DemolitionistMenuListItem { if ( !inv || (inv is 'Ammo') || (inv is 'MagAmmo') || (inv is 'HammerspaceEmbiggener') ) return; // weapons can't be switched to if they have no ammo - if ( ((inv is 'SWWMWeapon') && !SWWMWeapon(inv).ReportHUDAmmo()) - || (!(inv is 'SWWMWeapon') && ((!Weapon(inv).Ammo1 || (Weapon(inv).Ammo1.Amount > 0) || Weapon(inv).bAMMO_OPTIONAL) || (Weapon(inv).Ammo2 && ((Weapon(inv).Ammo2.Amount > 0) || Weapon(inv).bALT_AMMO_OPTIONAL)))) ) + if ( (inv is 'Weapon') && (((inv is 'SWWMWeapon') && !SWWMWeapon(inv).ReportHUDAmmo()) + || (!(inv is 'SWWMWeapon') && ((!Weapon(inv).Ammo1 || (Weapon(inv).Ammo1.Amount > 0) || Weapon(inv).bAMMO_OPTIONAL) || (Weapon(inv).Ammo2 && ((Weapon(inv).Ammo2.Amount > 0) || Weapon(inv).bALT_AMMO_OPTIONAL))))) ) { master.MenuSound("menu/noinvuse"); master.tmsg = StringTable.Localize("$SWWM_INVNAMMO");