From 42932d82b39cd9a2d921be37b11840e06eeef25b Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Wed, 15 Mar 2023 18:19:57 +0100 Subject: [PATCH] Revert "When filtering ammo display, include ammo not yet found." This reverts commit 4efe82ab34153e6a42c16a618d996e3c2080bb93. The feature is actually kinda silly, really. --- language.version | 4 ++-- zscript/hud/swwm_hud.zsc | 1 - zscript/hud/swwm_hud_weapons.zsc | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/language.version b/language.version index 9fa1526ca..aeb9e15e3 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r792 \cu(Wed 15 Mar 16:27:30 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r792 \cu(2023-03-15 16:27:30)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r793 \cu(Wed 15 Mar 18:19:57 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r793 \cu(2023-03-15 18:19:57)\c-"; diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 6cfdb7bc9..e38657431 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -182,7 +182,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 AmmoSlots[18]; // ammo type on each slot String AmmoNames[18]; // ammo 4-letter names int HealthFlash; // flash when healing diff --git a/zscript/hud/swwm_hud_weapons.zsc b/zscript/hud/swwm_hud_weapons.zsc index ad4d5e568..e250144f5 100644 --- a/zscript/hud/swwm_hud_weapons.zsc +++ b/zscript/hud/swwm_hud_weapons.zsc @@ -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; } } @@ -147,7 +145,6 @@ extend Class SWWMStatusBar // check if owned if ( checkowned ) { - if ( !AmmoFound[i] ) continue; bool owned = false; foreach ( w:OwnedWeapons ) {