OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Be less strict about forced hud scaling.

Browse source
This commit is contained in:
Mari the Deer 2020-11-03 20:00:47 +01:00
commit 69809078df
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
language.version
View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r597 \cu(Tue 3 Nov 18:53:27 CET 2020)";
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r598 \cu(Tue 3 Nov 20:00:47 CET 2020)";

8
zscript/swwm_hud.zsc
View file

@ -1390,14 +1390,10 @@ Class SWWMStatusBar : BaseStatusBar
if ( !dscale ) dscale = CVar.GetCVar('swwm_detscale',players[consoleplayer]);
BeginHUD();
if ( hscale.GetInt() <= 0 ) hs = GetHUDScale();
else
{
hs.x = hscale.GetInt();
if ( Screen.GetWidth()/hs.x < 640. ) hs.x = max(1,floor(Screen.GetWidth()/640.));
}
else hs.x = hscale.GetInt();
hs.y = hs.x;
ss = (Screen.GetWidth()/hs.x,Screen.GetHeight()/hs.y);
margin = clamp(safezone.GetInt(),0,(ss.x<640)?10:40);
margin = clamp(safezone.GetInt(),0,40);
if ( bscale.GetInt() <= 0 ) hsb = GetHUDScale();
else hsb.x = bscale.GetInt();
hsb.y = hsb.x;