OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix crash when using items from menu.

Browse source
This commit is contained in:
Mari the Deer 2022-07-29 21:33:00 +02:00
commit f90fa56234
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -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-";

4
zscript/kbase/swwm_kbasetab_inventory.zsc
View file

@ -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");