OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix incorrect values in HUD for unobtained ammo.

Browse source
This commit is contained in:
Mari the Deer 2022-11-16 22:34:26 +01:00
commit d8bf8a6063
2 changed files with 15 additions and 3 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 r616 \cu(Wed 16 Nov 22:33:26 CET 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r616 \cu(2022-11-16 22:33:26)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r617 \cu(Wed 16 Nov 22:34:26 CET 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r617 \cu(2022-11-16 22:34:26)\c-";

14
zscript/hud/swwm_hud.zsc
View file

@ -2743,7 +2743,19 @@ Class SWWMStatusBar : BaseStatusBar
amax = GetDefaultByType(a).MaxAmount;
let def = GetDefaultByType(a);
if ( def.MagAmmoType )
amax *= GetDefaultByType(def.MagAmmoType).ClipSize;
{
let mag = MagAmmo(CPlayer.mo.FindInventory(def.MagAmmoType));
if ( mag )
{
amt = mag.Amount;
amax = amax*mag.ClipSize+mag.MaxAmount;
}
else
{
let defmag = GetDefaultByType(def.MagAmmoType);
amax = amax*defmag.ClipSize+defmag.MaxAmount;
}
}
}
else
{