From 3b5a766f34f5c52450f2a79e0d176fa18ea8a1a9 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 1 Sep 2018 20:41:44 +0200 Subject: [PATCH] =?UTF-8?q?Add=20glyphs=20for=20=C5=90,=20=C5=91,=20=C5=B0?= =?UTF-8?q?=20and=20=C5=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../g2/font/latin/o-double-acute-bold.png | Bin 0 -> 180 bytes .../g2/font/latin/o-double-acute-small.png | Bin 0 -> 180 bytes .../g2/font/latin/o-double-acute-tiny.png | Bin 0 -> 171 bytes .../g2/font/latin/o-double-acute-uc-bold.png | Bin 0 -> 193 bytes .../g2/font/latin/o-double-acute-uc-small.png | Bin 0 -> 192 bytes .../g2/font/latin/o-double-acute-uc-tiny.png | Bin 0 -> 174 bytes .../g2/font/latin/u-double-acute-bold.png | Bin 0 -> 177 bytes .../g2/font/latin/u-double-acute-small.png | Bin 0 -> 177 bytes .../g2/font/latin/u-double-acute-tiny.png | Bin 0 -> 170 bytes .../g2/font/latin/u-double-acute-uc-bold.png | Bin 0 -> 190 bytes .../g2/font/latin/u-double-acute-uc-small.png | Bin 0 -> 190 bytes .../g2/font/latin/u-double-acute-uc-tiny.png | Bin 0 -> 170 bytes resources/g2/sprites.json | 72 ++++++++++++++++++ src/openrct2/drawing/Font.cpp | 15 ++++ src/openrct2/localisation/FormatCodes.h | 8 ++ src/openrct2/sprites.h | 7 +- 16 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/latin/o-double-acute-bold.png create mode 100644 resources/g2/font/latin/o-double-acute-small.png create mode 100644 resources/g2/font/latin/o-double-acute-tiny.png create mode 100644 resources/g2/font/latin/o-double-acute-uc-bold.png create mode 100644 resources/g2/font/latin/o-double-acute-uc-small.png create mode 100644 resources/g2/font/latin/o-double-acute-uc-tiny.png create mode 100644 resources/g2/font/latin/u-double-acute-bold.png create mode 100644 resources/g2/font/latin/u-double-acute-small.png create mode 100644 resources/g2/font/latin/u-double-acute-tiny.png create mode 100644 resources/g2/font/latin/u-double-acute-uc-bold.png create mode 100644 resources/g2/font/latin/u-double-acute-uc-small.png create mode 100644 resources/g2/font/latin/u-double-acute-uc-tiny.png diff --git a/resources/g2/font/latin/o-double-acute-bold.png b/resources/g2/font/latin/o-double-acute-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..81ce371b857b37abdabb69ff58307ee80545ffa1 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?gTe~DWM4f9tbfc literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/o-double-acute-small.png b/resources/g2/font/latin/o-double-acute-small.png new file mode 100644 index 0000000000000000000000000000000000000000..fd786d6353507d9a83266120d8bf03d9985db961 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ##0(@~B^+M>q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?tX4vR?STX585rs{I9y*z S2NVJoGkCiCxvX_!@hljQC0!qCAg>jC6&7I;J!Gca%qgD@k*tT_@uLG}_)Usv`= zoQy)Ede=-le*lFfJY5_^IIbrLBqhwKY;ffDVVY>g%*@ZsVElol{if#Pe?T=1p00i_ I>zopr0BZIt1poj5 literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/o-double-acute-uc-bold.png b/resources/g2/font/latin/o-double-acute-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..0eee0011858e7769f880a925b9ebd80c7030e539 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2hGm!icqpk;}cmjMvTvK(^I~e}|XXr3C{@?!h zZwyeJu_VYZn8D%MjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8VMc~ob0mO*>?NMQuI!IE z8HL1o-BM<80EP5CT^vI=t|uqFN=kU(V|(C$zQ#JMs7buxIm`njxgN@xNAg3p^r=85p>QL70(Y)*K0-AbW|YuPgf_ zPDUYd6_#sEDL^4zPZ!4!j_b(@ml6^l%;7sC$itJB$-`6ZCzmkeaAiXxo4{&a_O9aw e1_t#B3=DIHI8Myi%#{Pw$l&Sf=d#Wzp$Pzd$S`yO literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/o-double-acute-uc-tiny.png b/resources/g2/font/latin/o-double-acute-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..aea06720a5e331891d1c6df6daff7d8d7276ff20 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?&nhNM~SZe8Z8~b<+4I PP$h$>tDnm{r-UW|48<^h literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-double-acute-tiny.png b/resources/g2/font/latin/u-double-acute-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..5b2d9959e473ee52cdf2d3019055b17b9ed07036 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1p#0(_&p3JWWQak}ZA+D*q=^YIJ|1)$L8~<_!@hljQC0!qCAg>jC6&7I;J!Gca%qgD@k*tT_@uLG}_)Usv`= zoQy(}EDNpqm4HIxo-U3d9M_Wrk`iWAHZVFdO|)WW=4WOw-oes5E9=S+pb`d8S3j3^ HP6rp8A literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-double-acute-uc-bold.png b/resources/g2/font/latin/u-double-acute-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..05bf8a5d182480ed0a2ef4ac2b62809f4bae3f82 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2hGm!icqpk;}cmjMvTvK(^I~e}|XXr3C{@?!h zZwyeJu_VYZn8D%MjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8VMc~ob0mO*>?NMQuI!IE z8HE|m=Niq40t#t+x;Tb#Tu)ATk&tk~D?4F^)#ir8U8(}bP9L^RW#tKW=9UO?<~R88 bKb?W$Q7`w4Fs_ngKy3`3u6{1-oD!M<%f~Y< literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-double-acute-uc-small.png b/resources/g2/font/latin/u-double-acute-uc-small.png new file mode 100644 index 0000000000000000000000000000000000000000..7e27c943cdc2b10a9f4038d7ca1cc2b994908e5a GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRQ#0(^*v*+jnDV_kI5Z6@Q^bUsq{~0=rjsLg* z{Tl-mXDkWw3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=85p>QL70(Y)*K0-AbW|YuPgf_ zPDUXaF6%GX5`aS5o-U3d9M_W*UL+(0cqJ#yu>8z$xaKr7PqBq!1)IQX-SmV9J&6ek c{|+!PJk;TO{cy|Qn?P+0p00i_>zopr0LTC}H~;_u literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-double-acute-uc-tiny.png b/resources/g2/font/latin/u-double-acute-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..91c1c94330814b5af51a585f93b0cb6ef061409f GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?^102_AOR{g|$pb`d8S3j3^ HP6= 256) codepoint = '?'; @@ -569,6 +579,11 @@ bool font_supports_string_sprite(const utf8* text) case UNICODE_Y_ACUTE_UC: case UNICODE_Y_ACUTE: + case UNICODE_O_DOUBLE_ACUTE_UC: + case UNICODE_O_DOUBLE_ACUTE: + case UNICODE_U_DOUBLE_ACUTE_UC: + case UNICODE_U_DOUBLE_ACUTE: + supported = true; break; default: diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index 702a302c53..8acfaad5f3 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -317,4 +317,12 @@ enum UnicodeCzech UNICODE_Y_ACUTE = 253, }; +enum UnicodeHungarian +{ + UNICODE_O_DOUBLE_ACUTE_UC = 336, + UNICODE_O_DOUBLE_ACUTE = 337, + UNICODE_U_DOUBLE_ACUTE_UC = 368, + UNICODE_U_DOUBLE_ACUTE = 369, +}; + #endif diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 9110a9858b..f6cbd50356 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -919,7 +919,12 @@ enum SPR_G2_Y_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 64, SPR_G2_Y_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 65, - SPR_G2_CHAR_END = SPR_G2_Y_ACUTE_LOWER, + SPR_G2_O_DOUBLE_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 66, + SPR_G2_O_DOUBLE_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 67, + SPR_G2_U_DOUBLE_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 68, + SPR_G2_U_DOUBLE_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 69, + + SPR_G2_CHAR_END = SPR_G2_U_DOUBLE_ACUTE_LOWER, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, // 0x60000, chosen because it's a round hex number