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!ia0vp^>_E)T#0(_Q{j0YIQak}ZA+D*q=^YIJ|1)$L8~<<r
z`!@zC&R7!U7tG-B>_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!JQ
zCHWPsCDXJ&0fiJjT^vI=t|uoXB|NY>upsQff}IVCQ9Mk(y@>(32@mWU7^(s|JQm1p
RxC&Iv;OXk;vd$@?2>?uvFV_G7

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!ia0vp^Y(UJ##0(@~B^+M>q<8{+LR?dI(>oac|7YkhHvZrK
z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?<kJ24O~qS#u<Sg6t)pzOL+#
znI-uRWoK;al?Mt*d%8G=a9mG*kdzQ$dtkx+0|x6E8q-7@Sbj<}6os*04e{Cd52%d6
M)78&qol`;+0AQys?*IS*

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!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK
z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?<kJ24O~qS#u<Sg6t)pzOL+#
znI-uRnUnTzr~wK|db&7<a9mG*kdP3No^T;KVMZlGS3`^(8-w9LmN}1)23-UyV(@hJ
Kb6Mw<&;$V0*e%fj

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!ia0vp^oIuRY#0(@anEQ7CDV_kI5Z6@Q^bUsq{~0=rjsLg*
z{Tl-mXDkWw3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=fu;z9FeAgPITAoY_7YEDSN6xu
zlKd*Vo%f=b1BLWGT^vI=t|upCBqStwB_v#!bM%0L?N^4wUzR(p;W~JEnq0yRsj3D?
g(>aZe|M{62#NYEC+Agm10jQP1)78&qol`;+08xWC=>Px#

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!ia0vp^96-#?#0(_uzp88lQak}ZA+D*q=^YIJ|1)$L8~<<r
z`!@zC&R7!U7tG-B>_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!JQ
zCHeJDE8V25fI_OCE{-7_*OL>n5+3Lz1k66TAo`%ef6K!%r2?}So?BqXu5zx1fuY%p
VL&NoY^-`b)22WQ%mvv4FO#sa$F;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!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK
z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?<kJ24O~qS#u<Sg6t)pzOL+#
znI-uZrLBdns)0fho-U3d9M_W{BqRhRC(Nj1Xj~?jupym+!D}MBy6);J8-Z#VJYD@<
J);T3K0RT%|Dz^Xt

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,