OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Revert "When filtering ammo display, include ammo not yet found."

Browse source 
This reverts commit 4efe82ab34.

The feature is actually kinda silly, really.
This commit is contained in:
Mari the Deer 2023-03-15 18:19:57 +01:00
commit 20c8991400
3 changed files with 2 additions and 6 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 r774 \cu(Wed 15 Mar 16:28:45 CET 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r774 \cu(2023-03-15 16:28:45)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r775 \cu(Wed 15 Mar 18:21:19 CET 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r775 \cu(2023-03-15 18:21:19)\c-";

1
zscript/hud/swwm_hud.zsc
View file

@ -179,7 +179,6 @@ Class SWWMStatusBar : BaseStatusBar
int AmmoOldAmounts[18]; // to detect when to flash
int AmmoMaxFlash[18]; // flash when ammo max amount changes
int AmmoOldMaxAmounts[18]; // to detect when to flash
bool AmmoFound[18]; // have had non-zero ammo in this slot
Class<SWWMAmmo> AmmoSlots[18]; // ammo type on each slot
String AmmoNames[18]; // ammo 4-letter names
int HealthFlash; // flash when healing

3
zscript/hud/swwm_hud_weapons.zsc
View file

@ -40,8 +40,6 @@ extend Class SWWMStatusBar
if ( (maxamt > AmmoOldMaxAmounts[i]) && (AmmoOldMaxAmounts[i] != int.min) )
AmmoMaxFlash[i] = gametic+25;
AmmoOldMaxAmounts[i] = maxamt;
if ( !AmmoFound[i] && (amt > 0) )
AmmoFound[i] = true;
}
}
@ -148,7 +146,6 @@ extend Class SWWMStatusBar
// check if owned
if ( checkowned )
{
if ( !AmmoFound[i] ) continue;
bool owned = false;
foreach ( w:OwnedWeapons )
{