From 20c8991400ba4fcb8fb093fc7f44aa9afc933645 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 b47fa8f13..97d13bc54 100644 --- a/language.version +++ b/language.version @@ -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-"; diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 205b612b8..8bae4a55b 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -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 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 6f543466a..200a5c070 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; } } @@ -148,7 +146,6 @@ extend Class SWWMStatusBar // check if owned if ( checkowned ) { - if ( !AmmoFound[i] ) continue; bool owned = false; foreach ( w:OwnedWeapons ) {