From 69809078df1d7edbff2d6468cfef368921608a06 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Tue, 3 Nov 2020 20:00:47 +0100
Subject: [PATCH] Be less strict about forced hud scaling.

---
 language.version     | 2 +-
 zscript/swwm_hud.zsc | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/language.version b/language.version
index 38dd344e7..49a6b1c2a 100644
--- a/language.version
+++ b/language.version
@@ -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)";
diff --git a/zscript/swwm_hud.zsc b/zscript/swwm_hud.zsc
index b94b6b1f0..be261f4b8 100644
--- a/zscript/swwm_hud.zsc
+++ b/zscript/swwm_hud.zsc
@@ -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;