From 9031b2756bdcb25811055f630795bde00200fb46 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sun, 22 May 2022 20:11:30 +0200 Subject: [PATCH] Clamp HUD margin to 20 pixels max (40 is too much). --- language.version | 4 ++-- menudef.txt | 2 +- zscript/hud/swwm_hud.zsc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index 6b2273f90..f515034b4 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r69 \cu(Fri 20 May 13:11:58 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r69 \cu(2022-05-20 13:11:58)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r70 \cu(Sun 22 May 20:11:30 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r70 \cu(2022-05-22 20:11:30)\c-"; diff --git a/menudef.txt b/menudef.txt index 16d675ba1..f48aa63b8 100644 --- a/menudef.txt +++ b/menudef.txt @@ -117,7 +117,7 @@ OptionMenu "SWWMOptionMenu" Option "$SWWM_CAMHUD", "swwm_camhud", "YesNo" Option "$SWWM_FORCESTATS", "swwm_forcestats", "SWWMForceStats" Option "$SWWM_UNIQSTATS", "swwm_uniqstats", "YesNo" - Slider "$SWWM_HUDMARGIN", "swwm_hudmargin", 0, 40, 1, 0 + Slider "$SWWM_HUDMARGIN", "swwm_hudmargin", 0, 20, 1, 0 Slider "$SWWM_MAXMSG", "swwm_maxshown", 1, 10, 1, 0 Slider "$SWWM_MAXMSGBIG", "swwm_maxshownbig", 1, 20, 1, 0 Slider "$SWWM_MAXPICK", "swwm_maxpickup", 1, 10, 1, 0 diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 222383a5c..91674d663 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -2872,7 +2872,7 @@ Class SWWMStatusBar : BaseStatusBar else camhidden = false; hs = max(min(floor(Screen.GetWidth()/640.),floor(Screen.GetHeight()/360.)),1.); ss = (Screen.GetWidth()/hs,Screen.GetHeight()/hs); - margin = clamp(swwm_hudmargin,0,40); + margin = clamp(swwm_hudmargin,0,20); hsb = max(hs+swwm_barscalerel,1.); hsn = max(hs+swwm_numscalerel,1.); hss = max(hs+swwm_scrscalerel,1.);