From cf65d01ac0c19e02ef205724af2ecfdf555fa7ae Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Mon, 25 Mar 2019 16:51:27 +0100
Subject: [PATCH] Add U with ring

---
 resources/g2/font/latin/u-ring-bold.png     | Bin 0 -> 180 bytes
 resources/g2/font/latin/u-ring-small.png    | Bin 0 -> 174 bytes
 resources/g2/font/latin/u-ring-tiny.png     | Bin 0 -> 172 bytes
 resources/g2/font/latin/u-ring-uc-bold.png  | Bin 0 -> 194 bytes
 resources/g2/font/latin/u-ring-uc-small.png | Bin 0 -> 184 bytes
 resources/g2/font/latin/u-ring-uc-tiny.png  | Bin 0 -> 171 bytes
 resources/g2/sprites.json                   |  72 ++++++++++++++++++++
 src/openrct2/drawing/Font.cpp               |   4 ++
 src/openrct2/sprites.h                      |   6 +-
 9 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 resources/g2/font/latin/u-ring-bold.png
 create mode 100644 resources/g2/font/latin/u-ring-small.png
 create mode 100644 resources/g2/font/latin/u-ring-tiny.png
 create mode 100644 resources/g2/font/latin/u-ring-uc-bold.png
 create mode 100644 resources/g2/font/latin/u-ring-uc-small.png
 create mode 100644 resources/g2/font/latin/u-ring-uc-tiny.png

diff --git a/resources/g2/font/latin/u-ring-bold.png b/resources/g2/font/latin/u-ring-bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..d818014dcfd5bd6e7f3862b1f55b7dbef1f6610e
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0y~yU|?rpVBltAW?*1A_pjcXfq{W1z$e5tRX4qZ;s1Yz
z4rAm0?SKEqFfcGMmIV0)GdMiEkp|)<dAqwXbg;^LFfcH17I;J!Gca%qgD@k*tT_@O
zb4xsZUD+QqOY$pNOQvamVqjoU^mK6y;kcfhkd*Mi=D>om0}FOGBu4Qt`SvCT=q5a{
bXJDub;P6-=x8W)S0|SGntDnm{r-UW|OpY(t

literal 0
HcmV?d00001

diff --git a/resources/g2/font/latin/u-ring-small.png b/resources/g2/font/latin/u-ring-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f3afb46589ec9199c654c5a7e3e08d47c34104b
GIT binary patch
literal 174
zcmeAS@N?(olHy`uVBq!ia0y~yU|?flVBlh6W?*1=m2i9k0|Nt3fKP~Ps&0A*!~g#b
z9mdB0+yDNJVPIfjED7=pW^j0RBMrn!@^*J&=wOxgU|?Y2EbxddW?<kJ24O~qS#u;9
z7#P?~Jbhi+A2Unx8_Leu)GN=xz##4E;uyklJ^4XWLV)do1@{jatY>IU6K!DmDalY2
X#(p)#XX8Hx1_lOCS3j3^P6<r_V5ctc

literal 0
HcmV?d00001

diff --git a/resources/g2/font/latin/u-ring-tiny.png b/resources/g2/font/latin/u-ring-tiny.png
new file mode 100644
index 0000000000000000000000000000000000000000..c17b58b991e7e7ff9a8a7af0ab96579081ad1dd6
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0y~yU|?lnVBlb4W?*3OnSXZ$0|Nt3fKP~Ps&0A*!~g#b
z9mdB0+yDNJVPIfjED7=pW^j0RBMrn!@^*J&=wOxgU|?Y2EbxddW?<kJ24O~qS#u;9
z7#P?~Jbhi+A2Unx8!{*D-B828z#!@A;uyklJ^4XGLO^=Lh2(@8l?+`CF>-7ShW}XR
VJU$w9k%57M!PC{xWt~$(69CoNEztk~

literal 0
HcmV?d00001

diff --git a/resources/g2/font/latin/u-ring-uc-bold.png b/resources/g2/font/latin/u-ring-uc-bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a921028cde50231a33af5c5f8abf84509394366
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0y~yVBln6VBltAW?*2rVD8_+z`(#0;1lASs+-=y@c%zU
zhq3Yh_P>8)7#J8BOM?7@862M7NCR<_yxm<GI#^{rKt>dJL>4nJa0`PlBg3pY5)2Fs
z>?NMQuI!JQCHYl!JMTp=XJBB^_jGX#;kcfhkdcs(;FXYYVb0M52DV=r4u4thu!ig4
q<!N#WGo-2-98KpmHvZ>lW)OeRduY43&Ibkt1_n=8KbLh*2~7Y|gE#2_

literal 0
HcmV?d00001

diff --git a/resources/g2/font/latin/u-ring-uc-small.png b/resources/g2/font/latin/u-ring-uc-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..581629045c9a925153750c62e1404949154f7973
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0y~yVBlb2VBltAW?*2j|EjW$fq{W1z$e5tRX4qZ;s1Yz
z4rAm0?SKEqFfcGMmIV0)GdMiEkp|)<dAqwXbg;^LFfcH17I;J!Gca%qgD@k*tT_@4
z3=Hfgp1!W^kC`R;^-U|?q^uYi7*su7978y+CnsbjJkUu9n0;_T^g)CFmWO3Z1!gTg
hx4?{D<y;K|L$eo$hU@j}r3?%V44$rjF6*2UngGouF;M^j

literal 0
HcmV?d00001

diff --git a/resources/g2/font/latin/u-ring-uc-tiny.png b/resources/g2/font/latin/u-ring-uc-tiny.png
new file mode 100644
index 0000000000000000000000000000000000000000..908bb602141f0f58343721d69cd17c70a27a45e4
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0y~yU|?lnVBlb4W?*3OnSXZ$0|Nt3fKP~Ps&0A*!~g#b
z9mdB0+yDNJVPIfjED7=pW^j0RBMrn!@^*J&=wOxgU|?Y2EbxddW?<kJ24O~qS#u;9
z7#P?~Jbhi+A2UnxD@t1nTU9eKFi3d1IEHXsPkxY)5RjZOqmrR<nOwq#bOr{miR|jS
UtEX&aU|?YIboFyt=akR{083jcw*UYD

literal 0
HcmV?d00001

diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json
index f00aae5fac..394671e5e5 100644
--- a/resources/g2/sprites.json
+++ b/resources/g2/sprites.json
@@ -832,6 +832,30 @@
         "palette": "keep",
         "forceBmp": true
     },
+    {
+        "path": "font/latin/t-caron-uc-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/t-caron-small.png",
+        "y_offset": 1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-ring-uc-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-ring-small.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
     {
         "path": "font/rouble-small.png",
         "y_offset": 0,
@@ -1277,6 +1301,30 @@
         "palette": "keep",
         "forceBmp": true
     },
+    {
+        "path": "font/latin/t-caron-uc-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/t-caron-bold.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-ring-uc-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-ring-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
     {
         "path": "font/rouble-bold.png",
         "y_offset": 0,
@@ -1730,6 +1778,30 @@
         "palette": "keep",
         "forceBmp": true
     },
+    {
+        "path": "font/latin/t-caron-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/t-caron-tiny.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-ring-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-ring-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
     {
         "path": "font/rouble-tiny.png",
         "y_offset": 0,
diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp
index ded9cf5358..ccbce487d6 100644
--- a/src/openrct2/drawing/Font.cpp
+++ b/src/openrct2/drawing/Font.cpp
@@ -69,6 +69,10 @@ static const std::map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::s_cedilla, SPR_G2_S_CEDILLA_LOWER - SPR_CHAR_START },
     { UnicodeChar::s_caron_uc, SPR_G2_S_CARON_UPPER - SPR_CHAR_START },
     { UnicodeChar::s_caron, SPR_G2_S_CARON_LOWER - SPR_CHAR_START },
+    { UnicodeChar::t_caron_uc, SPR_G2_T_CARON_UPPER - SPR_CHAR_START },
+    { UnicodeChar::t_caron, SPR_G2_T_CARON_LOWER - SPR_CHAR_START },
+    { UnicodeChar::u_ring_uc, SPR_G2_U_RING_UPPER - SPR_CHAR_START },
+    { UnicodeChar::u_ring, SPR_G2_U_RING_LOWER - SPR_CHAR_START },
     { UnicodeChar::u_double_acute_uc, SPR_G2_U_DOUBLE_ACUTE_UPPER - SPR_CHAR_START },
     { UnicodeChar::u_double_acute, SPR_G2_U_DOUBLE_ACUTE_LOWER - SPR_CHAR_START },
     { UnicodeChar::z_acute_uc, CSChar::z_acute_uc - CS_SPRITE_FONT_OFFSET },
diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h
index 0fbf162cdf..9600cc522c 100644
--- a/src/openrct2/sprites.h
+++ b/src/openrct2/sprites.h
@@ -923,8 +923,12 @@ enum
     SPR_G2_R_CARON_LOWER = SPR_G2_CHAR_BEGIN + 77,
     SPR_G2_S_CARON_UPPER = SPR_G2_CHAR_BEGIN + 78,
     SPR_G2_S_CARON_LOWER = SPR_G2_CHAR_BEGIN + 79,
+    SPR_G2_T_CARON_UPPER = SPR_G2_CHAR_BEGIN + 80,
+    SPR_G2_T_CARON_LOWER = SPR_G2_CHAR_BEGIN + 81,
+    SPR_G2_U_RING_UPPER = SPR_G2_CHAR_BEGIN + 82,
+    SPR_G2_U_RING_LOWER = SPR_G2_CHAR_BEGIN + 83,
     
-    SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 80,
+    SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 84,
     SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN,
     SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1,