From 7bf38fecfe66c1a489a7e697b3e93b108356e26d Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 15 Apr 2022 18:32:34 +0200 Subject: [PATCH] Fix menu breaking if resolution is under 640x400. --- language.version | 4 ++-- zscript/kbase/swwm_kbase.zsc | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index 49359a1d0..69fcb39f7 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r31 \cu(Fri 15 Apr 18:30:29 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r31 \cu(2022-04-15 18:30:29)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r32 \cu(Fri 15 Apr 18:32:34 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r32 \cu(2022-04-15 18:32:34)\c-"; diff --git a/zscript/kbase/swwm_kbase.zsc b/zscript/kbase/swwm_kbase.zsc index 1bcf298de..9df889442 100644 --- a/zscript/kbase/swwm_kbase.zsc +++ b/zscript/kbase/swwm_kbase.zsc @@ -163,8 +163,10 @@ Class DemolitionistMenu : GenericMenu mSmallFont = Font.GetFont('TewiFont'); mTinyFont = Font.GetFont('MiniwiFont'); // note that we can assume 640x400 will always be the smallest resolution allowed by gzdoom, but we still need to handle widescreen - hs = max(min(floor(Screen.GetWidth()/640.),floor(Screen.GetHeight()/266.)),1.); - ss = (Screen.GetWidth(),Screen.GetHeight())/hs; + double sw = max(Screen.GetWidth(),640); + double sh = max(Screen.GetHeight(),400); + hs = max(min(floor(sw/640.),floor(sh/266.)),1.); + ss = (sw,sh)/hs; ws.x = 640.; double th = 640*(ss.y/ss.x); ws.y = round(th);