From fd1f763b83f91a172da60cb172231d71b642335c Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Sun, 24 Mar 2019 21:57:56 +0100
Subject: [PATCH] Add R with caron

---
 resources/g2/font/latin/r-caron-bold.png     | Bin 0 -> 172 bytes
 resources/g2/font/latin/r-caron-small.png    | Bin 0 -> 171 bytes
 resources/g2/font/latin/r-caron-tiny.png     | Bin 0 -> 171 bytes
 resources/g2/font/latin/r-caron-uc-bold.png  | Bin 0 -> 184 bytes
 resources/g2/font/latin/r-caron-uc-small.png | Bin 0 -> 182 bytes
 resources/g2/font/latin/r-caron-uc-tiny.png  | Bin 0 -> 172 bytes
 resources/g2/sprites.json                    |  36 +++++++++++++++++++
 src/openrct2/drawing/Font.cpp                |   2 ++
 src/openrct2/sprites.h                       |   5 +--
 9 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 resources/g2/font/latin/r-caron-bold.png
 create mode 100644 resources/g2/font/latin/r-caron-small.png
 create mode 100644 resources/g2/font/latin/r-caron-tiny.png
 create mode 100644 resources/g2/font/latin/r-caron-uc-bold.png
 create mode 100644 resources/g2/font/latin/r-caron-uc-small.png
 create mode 100644 resources/g2/font/latin/r-caron-uc-tiny.png

diff --git a/resources/g2/font/latin/r-caron-bold.png b/resources/g2/font/latin/r-caron-bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..65dbf1c4f8f16cb30ace0a37b79d99609098dc2a
GIT binary patch
literal 172
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%LNRaAG`Yyt{Ndb&7<a9mG*kd+Xio6s=fGQWXOx`To=8$;q(HocH&k$*r%44$rj
JF6*2UngF&cD^&mh

literal 0
HcmV?d00001

diff --git a/resources/g2/font/latin/r-caron-small.png b/resources/g2/font/latin/r-caron-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..4877c59bace2ad54b3d80bd0e703b735fbe99636
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^tU%1g#0(@E!)q1;DV_kI5Z6@Q^bUsq{~0=rjsLg*
z{Tl<4E(!7rW^j0RBMrn!@^*J&=wOxg0CG4BJR*x37`TN&n2}-D90{Nxdx@v7EBj++
z2@xd@8-M0WKp_cF7sn8e>&Xw25&~=wFepAZHaO$x#Kyzm{g_p5`Mdlupc)2GS3j3^
HP6<r_y*Me4

literal 0
HcmV?d00001

diff --git a/resources/g2/font/latin/r-caron-tiny.png b/resources/g2/font/latin/r-caron-tiny.png
new file mode 100644
index 0000000000000000000000000000000000000000..624312b79106bdc3ba3ee366b229fbadbd79a896
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%M&)E>;_iv<cvc)B=-a9mG*kdzQ$dw@alxv{|+MrCF;2Hnlf&lrPe7Xj5Uc)I$z
JtaD0e0svtXDt`a~

literal 0
HcmV?d00001

diff --git a/resources/g2/font/latin/r-caron-uc-bold.png b/resources/g2/font/latin/r-caron-uc-bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..c802499ed59decb829c370113032a4d5b1f14749
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
zB}9}}6T0)30fkgOT^vI=t|vc;I<P?M@Pe%kiCHX%zr5tRyv*2#mwn^%*5(~%W(+g;
WaIRXLtEvsuz~JfX=d#Wzp$Pyy2{V@f

literal 0
HcmV?d00001

diff --git a/resources/g2/font/latin/r-caron-uc-small.png b/resources/g2/font/latin/r-caron-uc-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bec8f344e529049e512b35a0dd60091a3883df3
GIT binary patch
literal 182
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%M2MFlv1_5g*HJzX3_IIbr@NJ<E>J+R>D0fViLiE)gF*D$rMWS2;5y2-}Qkdw`^
U`Q%mouR!Gtp00i_>zopr0OYJP7XSbN

literal 0
HcmV?d00001

diff --git a/resources/g2/font/latin/r-caron-uc-tiny.png b/resources/g2/font/latin/r-caron-uc-tiny.png
new file mode 100644
index 0000000000000000000000000000000000000000..48c6632cf4b46f5b7bda518c02cbd58bb2c25b5f
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%Nj*iX#4%?=cj^mK6y;kcfBAt7PLxdRL;%MA_A*f6N}N-`MNvHYwLc3ucn#Ng@b
K=d#Wzp$P!K6D(r@

literal 0
HcmV?d00001

diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json
index 775a67f7ed..bec93c5b82 100644
--- a/resources/g2/sprites.json
+++ b/resources/g2/sprites.json
@@ -808,6 +808,18 @@
         "palette": "keep",
         "forceBmp": true
     },
+    {
+        "path": "font/latin/r-caron-uc-small.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/r-caron-small.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
     {
         "path": "font/rouble-small.png",
         "y_offset": 0,
@@ -1229,6 +1241,18 @@
         "palette": "keep",
         "forceBmp": true
     },
+    {
+        "path": "font/latin/r-caron-uc-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/r-caron-bold.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
     {
         "path": "font/rouble-bold.png",
         "y_offset": 0,
@@ -1658,6 +1682,18 @@
         "palette": "keep",
         "forceBmp": true
     },
+    {
+        "path": "font/latin/r-caron-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/r-caron-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 ffebab11dc..735ca267d1 100644
--- a/src/openrct2/drawing/Font.cpp
+++ b/src/openrct2/drawing/Font.cpp
@@ -61,6 +61,8 @@ static const std::map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::n_caron, SPR_G2_N_CARON_LOWER - SPR_CHAR_START },
     { UnicodeChar::o_double_acute_uc, SPR_G2_O_DOUBLE_ACUTE_UPPER - SPR_CHAR_START },
     { UnicodeChar::o_double_acute, SPR_G2_O_DOUBLE_ACUTE_LOWER - SPR_CHAR_START },
+    { UnicodeChar::r_caron_uc, SPR_G2_R_CARON_UPPER - SPR_CHAR_START },
+    { UnicodeChar::r_caron, SPR_G2_R_CARON_LOWER - SPR_CHAR_START },
     { UnicodeChar::s_acute_uc, CSChar::s_acute_uc - CS_SPRITE_FONT_OFFSET },
     { UnicodeChar::s_acute, CSChar::s_acute - CS_SPRITE_FONT_OFFSET },
     { UnicodeChar::s_cedilla_uc, SPR_G2_S_CEDILLA_UPPER - SPR_CHAR_START },
diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h
index cad340541b..98af5976f7 100644
--- a/src/openrct2/sprites.h
+++ b/src/openrct2/sprites.h
@@ -917,11 +917,12 @@ enum
     SPR_G2_D_CARON_LOWER = SPR_G2_CHAR_BEGIN + 71,
     SPR_G2_E_CARON_UPPER = SPR_G2_CHAR_BEGIN + 72,
     SPR_G2_E_CARON_LOWER = SPR_G2_CHAR_BEGIN + 73,
-    
     SPR_G2_N_CARON_UPPER = SPR_G2_CHAR_BEGIN + 74,
     SPR_G2_N_CARON_LOWER = SPR_G2_CHAR_BEGIN + 75,
+    SPR_G2_R_CARON_UPPER = SPR_G2_CHAR_BEGIN + 76,
+    SPR_G2_R_CARON_LOWER = SPR_G2_CHAR_BEGIN + 77,
 
-    SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 76,
+    SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 78,
     SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN,
     SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1,