From df18a8c0a0b79f2f7c81e8c91ba8ceb43aee59a8 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Tue, 20 Oct 2020 13:41:46 +0200
Subject: [PATCH] HUD now should fit "21:9" (64:27 ~ 12:5). Make HUD ignore
 aspect ratio correction (enforce 1:1 pixels). Added screen border graphics
 (not very fancy).

---
 graphics/CHairC.png       | Bin 120 -> 0 bytes
 graphics/CHairD.png       | Bin 119 -> 0 bytes
 graphics/CHairL.png       | Bin 119 -> 0 bytes
 graphics/CHairR.png       | Bin 119 -> 0 bytes
 graphics/CHairU.png       | Bin 119 -> 0 bytes
 graphics/bord_b.png       | Bin 0 -> 78 bytes
 graphics/bord_bl.png      | Bin 0 -> 78 bytes
 graphics/bord_br.png      | Bin 0 -> 80 bytes
 graphics/bord_flat.png    | Bin 0 -> 89 bytes
 graphics/bord_l.png       | Bin 0 -> 79 bytes
 graphics/bord_r.png       | Bin 0 -> 78 bytes
 graphics/bord_t.png       | Bin 0 -> 71 bytes
 graphics/bord_tl.png      | Bin 0 -> 79 bytes
 graphics/bord_tr.png      | Bin 0 -> 85 bytes
 language.version          |   2 +-
 zmapinfo.txt              |   2 ++
 zscript/swwm_hud.zsc      |  48 +++++++++++++++++---------------------
 zscript/swwm_hudextra.zsc |   3 ++-
 18 files changed, 26 insertions(+), 29 deletions(-)
 delete mode 100644 graphics/CHairC.png
 delete mode 100644 graphics/CHairD.png
 delete mode 100644 graphics/CHairL.png
 delete mode 100644 graphics/CHairR.png
 delete mode 100644 graphics/CHairU.png
 create mode 100644 graphics/bord_b.png
 create mode 100644 graphics/bord_bl.png
 create mode 100644 graphics/bord_br.png
 create mode 100644 graphics/bord_flat.png
 create mode 100644 graphics/bord_l.png
 create mode 100644 graphics/bord_r.png
 create mode 100644 graphics/bord_t.png
 create mode 100644 graphics/bord_tl.png
 create mode 100644 graphics/bord_tr.png

diff --git a/graphics/CHairC.png b/graphics/CHairC.png
deleted file mode 100644
index 499e9536ec74dd1d9163ffd9480497e5cc13b062..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 120
zcmeAS@N?(olHy`uVBq!ia0y~yU|<4a4iNeG%B*4r1_qAwBF7{K1_nkDK5@Imfq{X6
zv%n*=n1O*?7=#%aX3ddcU|<mQba4#fn3??N|9^XCW@c_?Fkny-VP;P3&_B(<z`)??
L>gTe~DWM4f3f>oO

diff --git a/graphics/CHairD.png b/graphics/CHairD.png
deleted file mode 100644
index 5bb4300aac0c2b2ce18d7596e80e51b3cbf93167..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmeAS@N?(olHy`uVBq!ia0y~yU|?ckVBp{Ykum-|MM0eOBF7{K1_nkDK5@Imfq{X6
zv%n*=n1O*?7=#%aX3ddcU|<mSba4#fn3??N|9^XCW@c_?W@b+jh9&oyr7hX>Rx>a#
OFnGH9xvX<aXaWG3L>D;#

diff --git a/graphics/CHairL.png b/graphics/CHairL.png
deleted file mode 100644
index 36a902c1496b4eb9feee10422ddf0d6075d4ba42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmeAS@N?(olHy`uVBq!ia0y~yVBlb2U|`~4Vqjo+^^I#6NFcq)F^PeJft`VYfzf?-
z;{yf;2F?PH$YKTtZeb8+WSBKaf`NfS)YHW=gkxs%pa1{unavI~g-&T~WMr6N!OWc3
TQtZOOz`)??>gTe~DWM4fJ;)lt

diff --git a/graphics/CHairR.png b/graphics/CHairR.png
deleted file mode 100644
index 2ab5d1d3d799cc1c50e9f81b4b767c3c7c2328be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmeAS@N?(olHy`uVBq!ia0y~yVBlb2U|`~4Vqjo+^^I#6NFcq)F^PeJff0mH+%9oo
zU|`@Z@Q5sCVBi)8VMc~ob0ioT7(_i?978x}Cja^W-=5j*KvU?H#zsbl2^P%Ec`d~*
Q3=9kmp00i_>zopr07Ez$&j0`b

diff --git a/graphics/CHairU.png b/graphics/CHairU.png
deleted file mode 100644
index e81e279327625ecb745b09f92b88580c2464268c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmeAS@N?(olHy`uVBq!ia0y~yU|?ckVBp{Ykum-|MM0eOBF7{K1_nk31_pM;9T!U(
z7#KJUJR*x37`TN&n2}-D90>*n22oEJ#}JO0$$$R;w`XQ%=4NJQ_7q`Qa*tWsl09!V
Q0|Nttr>mdKI;Vst0EuW92LJ#7

diff --git a/graphics/bord_b.png b/graphics/bord_b.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c84e7f8b75c879dccc805b31ba5f99fe8de4393
GIT binary patch
literal 78
zcmeAS@N?(olHy`uVBq!ia0y~yU|?ckU|{9|k!Bs9*BBTWL_J*`LpZJ{CqRJ6gn)zw
aW(MYB2Cro0U#1KU3=E#GelF{r5}E)tj}ajN

literal 0
HcmV?d00001

diff --git a/graphics/bord_bl.png b/graphics/bord_bl.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce41492fc1a96a52f83481951908b03bcc1dc525
GIT binary patch
literal 78
zcmeAS@N?(olHy`uVBq!ia0y~yU|?ckU|{9|k!Bs9*BBTWL_J*`LpZJ{7kI2lPe@2e
fOGrp*U}g}FU{v|IK=mvG0|SGntDnm{r-UW|O<oc{

literal 0
HcmV?d00001

diff --git a/graphics/bord_br.png b/graphics/bord_br.png
new file mode 100644
index 0000000000000000000000000000000000000000..2966e5fef92eca28445166189f126384d8d096d1
GIT binary patch
literal 80
zcmeAS@N?(olHy`uVBq!ia0y~yU|<Ge4kiW$hMQhWFBljY#64XcLpZJ{CnO{YObAG5
h2#~R1;yJ;<z^BEqReRdrRSXOa44$rjF6*2UngC*)5(@wT

literal 0
HcmV?d00001

diff --git a/graphics/bord_flat.png b/graphics/bord_flat.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c3ea3be5d01705229e3060bd6d9199a7438b32b
GIT binary patch
literal 89
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFL6g*uVLp07OCpa+0#KiDy
rVcoKkF-hy=lY}paSMW9;Vq-}B$#^(G>$VyL0|SGntDnm{r-UW|aa9;c

literal 0
HcmV?d00001

diff --git a/graphics/bord_l.png b/graphics/bord_l.png
new file mode 100644
index 0000000000000000000000000000000000000000..af34f4db881e6de4743604649d3bc43ebc5e0d26
GIT binary patch
literal 79
zcmeAS@N?(olHy`uVBq!ia0y~yU|<4a4iNeG%B*4r1_m)t7sn8e>&XQkE7B7Z5|R=?
bfPsNGkWndg-v&7b1_lOCS3j3^P6<r_h3*o;

literal 0
HcmV?d00001

diff --git a/graphics/bord_r.png b/graphics/bord_r.png
new file mode 100644
index 0000000000000000000000000000000000000000..754a0b6efe53b635b84a39f626ec61df3d65e071
GIT binary patch
literal 78
zcmeAS@N?(olHy`uVBq!ia0y~yU|?ooU|`~4Vqjnp68q@Oz`!8t>Eal|aXmR9Awgh5
iKte)7LQ(@G14{sd_mWksPBSntFnGH9xvX<aXaWE$BoUJU

literal 0
HcmV?d00001

diff --git a/graphics/bord_t.png b/graphics/bord_t.png
new file mode 100644
index 0000000000000000000000000000000000000000..dad9f454b30228e593f68343fcea1d5f5f0153d7
GIT binary patch
literal 71
zcmeAS@N?(olHy`uVBq!ia0y~yU|<4a4iNeG%B*4r1_nM)7sn8e>&Yb^E7BX78F&L3
W6}R%$Ml&!lFnGH9xvX<aXaWG?GY^*l

literal 0
HcmV?d00001

diff --git a/graphics/bord_tl.png b/graphics/bord_tl.png
new file mode 100644
index 0000000000000000000000000000000000000000..171ba80110e60be8149db27fc5f18555f014333e
GIT binary patch
literal 79
zcmeAS@N?(olHy`uVBq!ia0y~yU|<4a4iNeG%B*4r1_m)t7sn8e>&bpE?&~Y8Jn&#b
f!1)6Q7#O7QF-uM5s4rk(U|{fc^>bP0l+XkK)%g{)

literal 0
HcmV?d00001

diff --git a/graphics/bord_tr.png b/graphics/bord_tr.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a2ed1dc172aee8d46dcf734edd87d44fa5639f0
GIT binary patch
literal 85
zcmeAS@N?(olHy`uVBq!ia0y~yU|?ooU|`~4Vqjnp68q@Oz`!8m>Eal|aXq=rV?}yG
p!k-V17@3)wn;Tk~n3<Uw%tBdIq(bitGB7YOc)I$ztaD0e0sy(A63zes

literal 0
HcmV?d00001

diff --git a/language.version b/language.version
index 8f2f20a6b..059aedab0 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r562 \cu(Tue 20 Oct 12:14:43 CEST 2020)";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r564 \cu(Tue 20 Oct 14:01:25 CEST 2020)";
diff --git a/zmapinfo.txt b/zmapinfo.txt
index 613bc09d1..385c087d1 100644
--- a/zmapinfo.txt
+++ b/zmapinfo.txt
@@ -29,6 +29,8 @@ GameInfo
 	MenuFontColor_Selection = "Sapphire"
 	MenuSliderColor = "Green"
 	MessageBoxClass = "SWWMMessageBox"
+	BorderFlat = "graphics/bord_flat.png"
+	Border = 2, 0, "graphics/bord_tr.png", "graphics/bord_t.png", "graphics/bord_tl.png", "graphics/bord_r.png", "graphics/bord_l.png", "graphics/bord_br.png", "graphics/bord_b.png", "graphics/bord_bl.png"
 	// precaching of frame-heavy objects
 	PrecacheClasses = "Demolitionist",
 		"DeepImpact",
diff --git a/zscript/swwm_hud.zsc b/zscript/swwm_hud.zsc
index dde256ac8..7611f49ee 100644
--- a/zscript/swwm_hud.zsc
+++ b/zscript/swwm_hud.zsc
@@ -595,7 +595,16 @@ Class SWWMStatusBar : BaseStatusBar
 	override void Init()
 	{
 		Super.Init();
-		SetSize(0,640,360);
+		// scaling is set to 640 pixels wide minimum
+		// and height set so it fits up to ultrawide (2.370:1 ~ 2.4:1)
+		// ultrawide is honestly an abomination,
+		// and these numbers should be proof enough of it
+		// none of the commercially available "21:9" screens even have
+		// that actual ratio in the first place, what the fuck man
+		// they dangle anywhere between 12:4, 43:18 and 64:27
+		// fuck ultrawide, seriously
+		// get a 16:10 screen instead, it's the best aspect ratio
+		SetSize(0,640,266);
 		StatusTex = TexMan.CheckForTexture("graphics/HUD/StatusBox.png",TexMan.Type_Any);
 		DashTex = TexMan.CheckForTexture("graphics/HUD/DashBar.png",TexMan.Type_Any);
 		FuelTex[0] = TexMan.CheckForTexture("graphics/HUD/FuelBar.png",TexMan.Type_Any);
@@ -1399,44 +1408,29 @@ Class SWWMStatusBar : BaseStatusBar
 		{
 			hs.x = hscale.GetInt();
 			if ( Screen.GetWidth()/hs.x < 640. ) hs.x = max(1,floor(Screen.GetWidth()/640.));
-			hs.y = hs.x;
 		}
+		hs.y = hs.x;
 		ss = (Screen.GetWidth()/hs.x,Screen.GetHeight()/hs.y);
 		margin = clamp(safezone.GetInt(),0,(ss.x<640)?10:40);
 		if ( bscale.GetInt() <= 0 ) hsb = GetHUDScale();
-		else
-		{
-			hsb.x = bscale.GetInt();
-			hsb.y = hsb.x;
-		}
+		else hsb.x = bscale.GetInt();
+		hsb.y = hsb.x;
 		ssb = (Screen.GetWidth()/hsb.x,Screen.GetHeight()/hsb.y);
 		if ( nscale.GetInt() <= 0 ) hsn = GetHUDScale();
-		else
-		{
-			hsn.x = nscale.GetInt();
-			hsn.y = hsn.x;
-		}
+		else hsn.x = nscale.GetInt();
+		hsn.y = hsn.x;
 		ssn = (Screen.GetWidth()/hsn.x,Screen.GetHeight()/hsn.y);
 		if ( sscale.GetInt() <= 0 ) hss = GetHUDScale();
-		else
-		{
-			hss.x = sscale.GetInt();
-			hss.y = hss.x;
-		}
+		else hss.x = sscale.GetInt();
+		hss.y = hss.x;
 		sss = (Screen.GetWidth()/hss.x,Screen.GetHeight()/hss.y);
 		if ( iscale.GetInt() <= 0 ) hsi = GetHUDScale();
-		else
-		{
-			hsi.x = iscale.GetInt();
-			hsi.y = hsi.x;
-		}
+		else hsi.x = iscale.GetInt();
+		hsi.y = hsi.x;
 		ssi = (Screen.GetWidth()/hsi.x,Screen.GetHeight()/hsi.y);
 		if ( dscale.GetInt() <= 0 ) hsd = GetHUDScale();
-		else
-		{
-			hsd.x = dscale.GetInt();
-			hsd.y = hsd.x;
-		}
+		else hsd.x = dscale.GetInt();
+		hsd.y = hsd.x;
 		ssd = (Screen.GetWidth()/hsd.x,Screen.GetHeight()/hsd.y);
 		FracTic = TicFrac;
 		DrawTarget();
diff --git a/zscript/swwm_hudextra.zsc b/zscript/swwm_hudextra.zsc
index 9fe1f47fe..67788af15 100644
--- a/zscript/swwm_hudextra.zsc
+++ b/zscript/swwm_hudextra.zsc
@@ -32,6 +32,7 @@ Class PayRespects : HUDMessageBase
 	override void ScreenSizeChanged()
 	{
 		hs = StatusBar.GetHUDScale()*scale;
+		hs.y = hs.x;
 		ss = (Screen.GetWidth()/hs.x,Screen.GetHeight()/hs.y);
 	}
 
@@ -90,8 +91,8 @@ Class SWWMOneLiner : HUDMessageBase
 		{
 			hs.x = hscale.GetInt();
 			if ( Screen.GetWidth()/hs.x < 640. ) hs.x = max(1,floor(Screen.GetWidth()/640.));
-			hs.y = hs.x;
 		}
+		hs.y = hs.x;
 		Vector2 ss = (Screen.GetWidth()/hs.x,Screen.GetHeight()/hs.y);
 		String loc = StringTable.Localize(whichline);
 		if ( loc.Length() <= 0 ) return;	// don't draw empty strings