From ad3528a7f18a9fc20641a695f8f73599ee0144eb Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 23 Jul 2018 23:42:07 +0200 Subject: [PATCH 1/6] Add sprite font glyph for the guilder sign --- data/language/en-GB.txt | 2 +- resources/g2/font/guilder-bold.png | Bin 0 -> 237 bytes resources/g2/font/guilder-small.png | Bin 0 -> 181 bytes resources/g2/font/guilder-tiny.png | Bin 0 -> 176 bytes resources/g2/sprites.json | 18 ++++++++++++++++++ src/openrct2/drawing/Font.cpp | 9 +++++++++ src/openrct2/localisation/Currency.cpp | 2 +- src/openrct2/localisation/FormatCodes.h | 8 ++++++++ src/openrct2/sprites.h | 4 +++- 9 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 resources/g2/font/guilder-bold.png create mode 100644 resources/g2/font/guilder-small.png create mode 100644 resources/g2/font/guilder-tiny.png diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 340e36422b..cbdc1c56c0 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -2345,7 +2345,7 @@ STR_2337 :Deutschmark (DM) STR_2338 :Yen ({YEN}) STR_2339 :Peseta (Pts) STR_2340 :Lira (L) -STR_2341 :Guilders (fl.) +STR_2341 :Guilders (ƒ) STR_2342 :Krona (kr) STR_2343 :Euros ({EURO}) STR_2344 :Imperial diff --git a/resources/g2/font/guilder-bold.png b/resources/g2/font/guilder-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..ee37c74ec15de06bdeee6e0f66dc71026a11e562 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^AT~D>Gmx}q_|grecmjMvT>t<7-@)+zKSPJH@&A@6 zJ~yB^V@Z%-FoVOh8)+a;lDE4HLkFv@2av;A;1O92G({MM85w5HkpK#^mw5WRvOi)M z7nK$6?0gS0K{hiaqQp5rH#aq}1juDza4t$sEJ;mKD9TWe18Idb&7< za9mGLco22qzycsP_{+e2xrB}FT!4b?`2z<;m{YDB7-TRlT_%^1upvExfnnoI_Weq3 RiEBWndb;|#taD0e0swh@LcRb1 literal 0 HcmV?d00001 diff --git a/resources/g2/font/guilder-small.png b/resources/g2/font/guilder-small.png new file mode 100644 index 0000000000000000000000000000000000000000..92948070418ddd467c880689107ab0953499ae6a GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR|m<|KGvz|35>AvGMO>_%)r1c48n{Iv*t(u1=&kHeO=if zv5Sieayf=`bOD8wJY5_^IIbrrL>xFEa`?c{#>USK%~^~cEJ|mYc`i#z|$H8 Te6gr4P&I?6tDnm{r-UW|NgppK literal 0 HcmV?d00001 diff --git a/resources/g2/font/guilder-tiny.png b/resources/g2/font/guilder-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ed827b104066fef5fc7c2e31b894c221a5bb54 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1p#0(_&p3JWWQak}ZA+G=b|LsR2y72=Q OGI+ZBxvX= 256) codepoint = '?'; @@ -493,6 +500,8 @@ bool font_supports_string_sprite(const utf8* text) case FORMAT_SINGLE_ENDQUOTE: case FORMAT_GERMAN_SINGLE_OPENQUOTE: + case UNICODE_GUILDER_SIGN: + supported = true; break; default: diff --git a/src/openrct2/localisation/Currency.cpp b/src/openrct2/localisation/Currency.cpp index 0322681dba..aa802d0106 100644 --- a/src/openrct2/localisation/Currency.cpp +++ b/src/openrct2/localisation/Currency.cpp @@ -22,7 +22,7 @@ currency_descriptor CurrencyDescriptors[CURRENCY_END] = { { "JPY", 1000, CURRENCY_PREFIX, "\xC2\xA5", CURRENCY_SUFFIX, "YEN", STR_YEN }, // Japanese Yen { "ESP", 10, CURRENCY_SUFFIX, "Pts", CURRENCY_SUFFIX, "Pts", STR_PESETA }, // Spanish Peseta { "ITL", 1000, CURRENCY_PREFIX, "L", CURRENCY_PREFIX, "L", STR_LIRA }, // Italian Lira - { "NLG", 10, CURRENCY_PREFIX, "\xC6\x92", CURRENCY_PREFIX, "fl.", STR_GUILDERS }, // Dutch Guilder + { "NLG", 10, CURRENCY_PREFIX, "\xC6\x92 ", CURRENCY_PREFIX, "fl.", STR_GUILDERS }, // Dutch Guilder { "SEK", 10, CURRENCY_SUFFIX, " kr", CURRENCY_SUFFIX, " kr", STR_KRONA }, // Swedish Krona { "EUR", 10, CURRENCY_PREFIX, "\xE2\x82\xAC", CURRENCY_SUFFIX, "EUR", STR_EUROS }, // Euro { "KRW", 10000, CURRENCY_PREFIX, "\xE2\x82\xA9", CURRENCY_PREFIX, "W", STR_WON }, // South Korean Won diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index 5443702f96..d419a97a72 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -271,4 +271,12 @@ enum UnicodeDingbats UNICODE_DINGBATS_MINUS = 0x2796, }; +enum UnicodeCurrency +{ + UNICODE_GUILDER_SIGN = 402, + + // Not a currency sign, but the guilder sign will be capitalised to this. + UNICODE_F_WITH_HOOK_UC = 401, +}; + #endif diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index bd791b9737..2f51675d13 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -896,7 +896,9 @@ enum SPR_G2_GERMAN_OPENQUOTES = SPR_G2_CHAR_BEGIN + 49, - SPR_G2_CHAR_END = SPR_G2_GERMAN_OPENQUOTES, + SPR_G2_GUILDER_SIGN = SPR_G2_CHAR_BEGIN + 50, + + SPR_G2_CHAR_END = SPR_G2_GUILDER_SIGN, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, // 0x60000, chosen because it's a round hex number From 00a8f41341cb6056d230e2a86682c9ab0f0371b1 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 23 Jul 2018 23:42:37 +0200 Subject: [PATCH 2/6] Use Russian name for Russian language. This is possible now the sprite font supports it. --- src/openrct2/localisation/Language.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/localisation/Language.cpp b/src/openrct2/localisation/Language.cpp index 871bea46d6..0cdbd1ef92 100644 --- a/src/openrct2/localisation/Language.cpp +++ b/src/openrct2/localisation/Language.cpp @@ -43,7 +43,7 @@ const language_descriptor LanguagesDescriptors[LANGUAGE_COUNT] = { "nb-NO", "Norwegian", "Norsk", FAMILY_OPENRCT2_SPRITE, RCT2_LANGUAGE_ID_ENGLISH_UK }, // LANGUAGE_NORWEGIAN { "pl-PL", "Polish", "Polski", FAMILY_OPENRCT2_SPRITE, RCT2_LANGUAGE_ID_ENGLISH_UK }, // LANGUAGE_POLISH { "pt-BR", "Portuguese (BR)", u8"Português (BR)", FAMILY_OPENRCT2_SPRITE, RCT2_LANGUAGE_ID_PORTUGUESE }, // LANGUAGE_PORTUGUESE_BR - { "ru-RU", "Russian", "Russian", FAMILY_OPENRCT2_SPRITE, RCT2_LANGUAGE_ID_ENGLISH_UK }, // LANGUAGE_RUSSIAN + { "ru-RU", "Russian", u8"Русский", FAMILY_OPENRCT2_SPRITE, RCT2_LANGUAGE_ID_ENGLISH_UK }, // LANGUAGE_RUSSIAN { "fi-FI", "Finnish", "Suomi", FAMILY_OPENRCT2_SPRITE, RCT2_LANGUAGE_ID_ENGLISH_UK }, // LANGUAGE_FINNISH { "sv-SE", "Swedish", "Svenska", FAMILY_OPENRCT2_SPRITE, RCT2_LANGUAGE_ID_SWEDISH }, // LANGUAGE_SWEDISH }; From e6472eec0013b2e9458266de12fc92ff9e70e423 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 24 Jul 2018 13:54:19 +0200 Subject: [PATCH 3/6] Add Turkish sprite font glyphs --- resources/g2/font/g-breve-bold.png | Bin 0 -> 176 bytes resources/g2/font/g-breve-small.png | Bin 0 -> 176 bytes resources/g2/font/g-breve-tiny.png | Bin 0 -> 180 bytes resources/g2/font/g-breve-uc-bold.png | Bin 0 -> 196 bytes resources/g2/font/g-breve-uc-small.png | Bin 0 -> 187 bytes resources/g2/font/g-breve-uc-tiny.png | Bin 0 -> 174 bytes resources/g2/font/i-with-dot-uc-bold.png | Bin 0 -> 164 bytes resources/g2/font/i-with-dot-uc-small.png | Bin 0 -> 164 bytes resources/g2/font/i-with-dot-uc-tiny.png | Bin 0 -> 164 bytes resources/g2/font/i-without-dot-bold.png | Bin 0 -> 161 bytes resources/g2/font/i-without-dot-small.png | Bin 0 -> 161 bytes resources/g2/font/i-without-dot-tiny.png | Bin 0 -> 161 bytes resources/g2/font/s-cedilla-bold.png | Bin 0 -> 185 bytes resources/g2/font/s-cedilla-small.png | Bin 0 -> 181 bytes resources/g2/font/s-cedilla-tiny.png | Bin 0 -> 176 bytes resources/g2/font/s-cedilla-uc-bold.png | Bin 0 -> 187 bytes resources/g2/font/s-cedilla-uc-small.png | Bin 0 -> 188 bytes resources/g2/font/s-cedilla-uc-tiny.png | Bin 0 -> 173 bytes resources/g2/sprites.json | 108 ++++++++++++++++++++++ src/openrct2/drawing/Font.cpp | 21 +++++ src/openrct2/localisation/FormatCodes.h | 10 ++ src/openrct2/sprites.h | 9 +- 22 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/g-breve-bold.png create mode 100644 resources/g2/font/g-breve-small.png create mode 100644 resources/g2/font/g-breve-tiny.png create mode 100644 resources/g2/font/g-breve-uc-bold.png create mode 100644 resources/g2/font/g-breve-uc-small.png create mode 100644 resources/g2/font/g-breve-uc-tiny.png create mode 100644 resources/g2/font/i-with-dot-uc-bold.png create mode 100644 resources/g2/font/i-with-dot-uc-small.png create mode 100644 resources/g2/font/i-with-dot-uc-tiny.png create mode 100644 resources/g2/font/i-without-dot-bold.png create mode 100644 resources/g2/font/i-without-dot-small.png create mode 100644 resources/g2/font/i-without-dot-tiny.png create mode 100644 resources/g2/font/s-cedilla-bold.png create mode 100644 resources/g2/font/s-cedilla-small.png create mode 100644 resources/g2/font/s-cedilla-tiny.png create mode 100644 resources/g2/font/s-cedilla-uc-bold.png create mode 100644 resources/g2/font/s-cedilla-uc-small.png create mode 100644 resources/g2/font/s-cedilla-uc-tiny.png diff --git a/resources/g2/font/g-breve-bold.png b/resources/g2/font/g-breve-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..bee63f5345186f70c30a448388b6714369c49769 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)J#0(@a|MqVNaRPioTzTaLIvD={XXr3C{?D^7 zBn&9dSQ6wH%;50sMjD8d1>}ba4#fxSsqV>c9f2!wibc4_>$;u|Z*iPQn9w28OBII5Kno8m`MhS?`L%B~*0#|>1- N;OXk;vd$@?2>@z-EeZet literal 0 HcmV?d00001 diff --git a/resources/g2/font/g-breve-tiny.png b/resources/g2/font/g-breve-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..ef6bca05f77ac418ce21422185eff75c48951494 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1k#0(_c5A*Q?DV_kI5LXUwfewcM{~0=rjsMU6 z5~KhWXDkWw3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=85p>QL70(Y)*K0-AbW|YuPgf_ zb_s4y>F4TtAd?k6T^vI=t|wneN|;gAaImY<@hijOGt3G>pBWC9u(3(AF+`=a&17qA R=m9Eb@O1TaS?83{1OUmsEIxmEF#P||&|z%+e~PTK z8&I6FB*-tA!Qt7BG!Q4r+uensgH_f8$l)yTh%9Dc;1&j9Muu5)B!GhKC7!;n?2p(b zxS5SLYV&G=LWZ6$jv*Y^lM|v29ylO*?f}EG!x9o9&e9Ug>~s@mth;)^AUBKg@Rg;k h4jY*hOwZIyFfbSKh^wje)&Mm#c)I$ztaD0e0sue7F;xHn literal 0 HcmV?d00001 diff --git a/resources/g2/font/g-breve-uc-small.png b/resources/g2/font/g-breve-uc-small.png new file mode 100644 index 0000000000000000000000000000000000000000..5baa42d680bedf574dba7af24653ac988300b345 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^96-#?#0(_uzp88lQak}ZA+A8WgW>;wh7M!n|DN{N zbAf!uk|4ie28U-i(mGR&GI0Tg5}@$_|Nf5a}q zEzdOnim?<>NW;^`F@)oK@`I=Y3#1M+C@D)kvrnI~xhXNu;&9J%o~&XC3vP)S{0t0J XcX9R`TE{5^^)Pt4`njxgN@xNA_9iYM literal 0 HcmV?d00001 diff --git a/resources/g2/font/g-breve-uc-tiny.png b/resources/g2/font/g-breve-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..623092cdb5f2b435706853746d51fafdf07b9195 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1k#0(_c5A*Q?DV_kI5LZEYfewcM{~0=rjsG7} z(tZsTXDkWw3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=85p>QL70(Y)*K0-AbW|YuPgf_ zb_s4KW5cv~8=#Q1r;B3<$Mxh3NeMHm8W^3b literal 0 HcmV?d00001 diff --git a/resources/g2/font/i-with-dot-uc-bold.png b/resources/g2/font/i-with-dot-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..220fbe009a05f0e32a2e9961ba5e9eec59055fa8 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^EI`c7#0(@=Pad%VQak}ZA+GFR0v!zh|1)$L8~@jP zCo~Z#&R7!U7tG-B>_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!K4 zCAbX?T;-#_1BC=VT^vI=t|wnem~oEb(1{Cd3}y>hU03TkT>(lmc)I$ztaD0e0sv5b BC#L`a literal 0 HcmV?d00001 diff --git a/resources/g2/font/i-with-dot-uc-small.png b/resources/g2/font/i-with-dot-uc-small.png new file mode 100644 index 0000000000000000000000000000000000000000..9262c3c9bef3e8252949de2f6a1100221f777d09 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y|1R{@%-gg92JOMr-u1Ycj9Sr~fGjtdm|FH=O_DAdz z+={$@>rB4^g#^C310@+eUHx3vIVCg!06gv} A00000 literal 0 HcmV?d00001 diff --git a/resources/g2/font/i-with-dot-uc-tiny.png b/resources/g2/font/i-with-dot-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..394e0dc0a2ade4863a24cef0cd1d61bc4b58b397 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y+1R@<9*S-f*JOMr-uEsI~9Sr~fGjtdm|6h5E zqZcU7SQ6wH%;50sMjD8dmdKI;Vst0BL?E ASO5S3 literal 0 HcmV?d00001 diff --git a/resources/g2/font/i-without-dot-bold.png b/resources/g2/font/i-without-dot-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..e76174aeed8f4d11e59910194c7e32112d7cb982 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^EI`b`#0(@C$8MVjq<8{+LR^7#2gCpW3?0VC|2^%k z=K}eRB|(0{3=Yq3q=7g|-tI089jvk*Kn`btM`SSr1Gg{;GcwGYBLNg-FY)wsWq-sj x!C@lz|FKRgP>9dd#W95Adh&&Y8GS6d402zX-?!g!)&$Bhc)I$ztaD0e0szGRCWin3 literal 0 HcmV?d00001 diff --git a/resources/g2/font/i-without-dot-small.png b/resources/g2/font/i-without-dot-small.png new file mode 100644 index 0000000000000000000000000000000000000000..a96fc162ec26ab67ee97fe8a1747e7d3822012e0 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y+1R@<9*S-f*JOMr-u0Xnj;s1Yz4rAm0p7z#r zfqcf2AirP+hi5m^K%69RcNc~ZR#^`qhqJ&VvY3H^TNs2H8D`Cq01C2~c>21sKVp~Q wFp=)>yzvSs#OLYa7{YNqIUr$1GYc<+d;;^&tNYfe0%aIHUHx3vIVCg!0KzdQ9{>OV literal 0 HcmV?d00001 diff --git a/resources/g2/font/i-without-dot-tiny.png b/resources/g2/font/i-without-dot-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..6a559798855f2a602eaa11526b6b7f6b38fa1f75 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y_1S0>+?=u8aJOMr-t_-pQ9Sr~fGjtdm|L6W} zyb~zSSQ6wH%;50sMjD8d`N+B$ogH literal 0 HcmV?d00001 diff --git a/resources/g2/font/s-cedilla-bold.png b/resources/g2/font/s-cedilla-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..c041b2b1d09c8fbd5dd6d1ec16066546b5443d60 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR=X_1UeZ0|7YkhHvYft zo5*FLIAckWUoeBivm0q3PLj8~3quF1tOt<8S>O>_%)r1c48n{Iv*t(u1=&kHeO=if zu}g3po61G}-3=5{^K@|x;kcgsAnL#Zslx`j%*|O$&0#!;uSl?6=I5El%Cm}H;)f(d Y{yBDo1IN}a1nOY$boFyt=akR{0CXWRVgLXD literal 0 HcmV?d00001 diff --git a/resources/g2/font/s-cedilla-small.png b/resources/g2/font/s-cedilla-small.png new file mode 100644 index 0000000000000000000000000000000000000000..a3e039c00e8e056c581716e047c9774701d0e948 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ##0(@~B^+M>q<8{+LR?v71v(i1|7YkhHvZ4? zmE#ytoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?gTe~DWM4ftnDsq literal 0 HcmV?d00001 diff --git a/resources/g2/font/s-cedilla-tiny.png b/resources/g2/font/s-cedilla-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..87506ba6725778012a143ae0470a4bb2ab9368f8 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1p#0(_&p3JWWQak}ZA+8oO0v!zh|1)$L8~?u% zv8EX)&R7!U7tG-B>_!@hljQC0!qCAg>jC6&7I;J!Gca%qgD@k*tT_@uLG}_)Usv`= z>=Il?YEAaffpQG8o-U3d9M_W{Bqapc9x&)_bo|V4xP*u`p00i_>zopr010g`z5oCK literal 0 HcmV?d00001 diff --git a/resources/g2/font/s-cedilla-uc-small.png b/resources/g2/font/s-cedilla-uc-small.png new file mode 100644 index 0000000000000000000000000000000000000000..fe23aa3ffe0255e42a996d8a43079a74e02539eb GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJz#0(^DELHY`H~~H(u2RMV9Sr~fGjtdm|F<-o z^c5)1SQ6wH%;50sMjD8dbP0l+XkKPeCj< literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 3d3716fb20..10ee4f98e7 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -704,6 +704,42 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/g-breve-uc-small.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/i-with-dot-uc-small.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/s-cedilla-uc-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/g-breve-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/i-without-dot-small.png", + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/s-cedilla-small.png", + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, { "path": "font/ae-uc-bold.png", "y_offset": 0, @@ -969,6 +1005,42 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/g-breve-uc-bold.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/i-with-dot-uc-bold.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/s-cedilla-uc-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/g-breve-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/i-without-dot-bold.png", + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/s-cedilla-bold.png", + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, { "path": "font/ae-uc-tiny.png", "y_offset": 0, @@ -1241,5 +1313,41 @@ "y_offset": 1, "palette": "keep", "forceBmp": true + }, + { + "path": "font/g-breve-uc-tiny.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/i-with-dot-uc-tiny.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/s-cedilla-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/g-breve-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/i-without-dot-tiny.png", + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/s-cedilla-tiny.png", + "y_offset": 1, + "palette": "keep", + "forceBmp": true } ] diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index e69801d036..5ca1c9aa6f 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -336,6 +336,20 @@ int32_t font_sprite_get_codepoint_offset(int32_t codepoint) case UNICODE_GUILDER_SIGN: return SPR_G2_GUILDER_SIGN - SPR_CHAR_START; + // Turkish + case UNICODE_G_BREVE_UC: + return SPR_G2_G_BREVE_UPPER - SPR_CHAR_START; + case UNICODE_I_WITH_DOT_UC: + return SPR_G2_I_WITH_DOT_UPPER - SPR_CHAR_START; + case UNICODE_S_CEDILLA_UC: + return SPR_G2_S_CEDILLA_UPPER - SPR_CHAR_START; + case UNICODE_G_BREVE: + return SPR_G2_G_BREVE_LOWER - SPR_CHAR_START; + case UNICODE_I_WITHOUT_DOT: + return SPR_G2_I_WITHOUT_DOT_LOWER - SPR_CHAR_START; + case UNICODE_S_CEDILLA: + return SPR_G2_S_CEDILLA_LOWER - SPR_CHAR_START; + // This is to catch capitalised versions of the guilder sign case UNICODE_F_WITH_HOOK_UC: return 'F' - 32; @@ -502,6 +516,13 @@ bool font_supports_string_sprite(const utf8* text) case UNICODE_GUILDER_SIGN: + case UNICODE_G_BREVE_UC: + case UNICODE_I_WITH_DOT_UC: + case UNICODE_S_CEDILLA_UC: + case UNICODE_G_BREVE: + case UNICODE_I_WITHOUT_DOT: + case UNICODE_S_CEDILLA: + supported = true; break; default: diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index d419a97a72..91208cd2a4 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -265,6 +265,16 @@ enum UnicodeCyrillic }; +enum UnicodeTurkish +{ + UNICODE_G_BREVE_UC = 286, + UNICODE_G_BREVE = 287, + UNICODE_I_WITH_DOT_UC = 304, + UNICODE_I_WITHOUT_DOT = 305, + UNICODE_S_CEDILLA_UC = 350, + UNICODE_S_CEDILLA = 351, +}; + enum UnicodeDingbats { UNICODE_DINGBATS_PLUS = 0x2795, diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 2f51675d13..b894f7b911 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -898,7 +898,14 @@ enum SPR_G2_GUILDER_SIGN = SPR_G2_CHAR_BEGIN + 50, - SPR_G2_CHAR_END = SPR_G2_GUILDER_SIGN, + SPR_G2_G_BREVE_UPPER = SPR_G2_CHAR_BEGIN + 51, + SPR_G2_I_WITH_DOT_UPPER = SPR_G2_CHAR_BEGIN + 52, + SPR_G2_S_CEDILLA_UPPER = SPR_G2_CHAR_BEGIN + 53, + SPR_G2_G_BREVE_LOWER = SPR_G2_CHAR_BEGIN + 54, + SPR_G2_I_WITHOUT_DOT_LOWER = SPR_G2_CHAR_BEGIN + 55, + SPR_G2_S_CEDILLA_LOWER = SPR_G2_CHAR_BEGIN + 56, + + SPR_G2_CHAR_END = SPR_G2_S_CEDILLA_LOWER, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, // 0x60000, chosen because it's a round hex number From 8481c4ec581fb5806264b7e3de295ca5f0848ec5 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 24 Jul 2018 21:07:02 +0200 Subject: [PATCH 4/6] Add sprite font glyph for interpunct --- resources/g2/font/interpunct-bold.png | Bin 0 -> 873 bytes resources/g2/font/interpunct-small.png | Bin 0 -> 870 bytes resources/g2/font/interpunct-tiny.png | Bin 0 -> 870 bytes resources/g2/sprites.json | 18 ++++++++++++++++++ src/openrct2/drawing/Font.cpp | 5 +++++ src/openrct2/localisation/FormatCodes.h | 5 +++++ src/openrct2/sprites.h | 4 +++- 7 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/interpunct-bold.png create mode 100644 resources/g2/font/interpunct-small.png create mode 100644 resources/g2/font/interpunct-tiny.png diff --git a/resources/g2/font/interpunct-bold.png b/resources/g2/font/interpunct-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..9f6982b726b26cac837c4b633c24316861e41ccc GIT binary patch literal 873 zcmaJ=v8$wZ5T4@#9{27ru!STR7F$?YSXfwCn8bIOhsX0c4=gNvoJTB#SQywsh!EkH zU}3R^goWF}V&Q~r@d_ap78YB0!D0{gz`}!tSX?2*VvAS&;`;|OeBXRC&3who{Qlxv ze){;^#{ls3>c`8MlYVv2M-Qj`j{W&Lz(aWP{MECm{huJ_^Et<{k|b)HVp)dgxnUS4 z$!539tLo6U!#Hv*hytj}g<;Gbhg$gTG7^%ty4{&Y>D5itol=Rxbm78Ph(M=ei{5zL zZ77wAUhmv?zwF!eJXA6XCIbr*Vh!86SQ+8R?QE<`)U#+b(OryCH3v`uObl~zJRr%K zrc*(W=vHNB7Edl@ zCenqiB^935gw`?fPFXmV$+^kUslsPG&FCC&i_${VBFkDY7P}}aH=8EUyTf4^1_Y!F zbb@hPTq;PdX6#N{o{Y3#6hnL%cm3V*j4l`)=Ltfl<{HCVg5W9Y(wv6*yJ)rF?%Jvu zI}uC;^E5m#sn}uGzL+hwVr}oU;8?EvV>OOnkO-gycmOd#2CxS>VSpy667oHirKmls zG`JkBM95`mRX`dbmp~DRQWfP6s+Xuu;ePQvC=%!@=2%3qU{{zGKnh{_MkGoK1U{n z0vfG3l#8fQrpy1k`}}^A2fw_$*5JE;KK(Q`#MR~ZuO9tj-Q2u>J@L((w_iW`@Zkx- Xzwk}=>t7%5ALi=W_2r*G-2C<*2}W;K literal 0 HcmV?d00001 diff --git a/resources/g2/font/interpunct-small.png b/resources/g2/font/interpunct-small.png new file mode 100644 index 0000000000000000000000000000000000000000..8e0846b989c2143f81c928b0419a0c35bb21b188 GIT binary patch literal 870 zcmaJP!F%ub*LU*E z7hk;qfS0%5-@KXmvpGM1{#1XRe);-Izy9Ivt6Ba}5XgVlZ8}b`>Jjsnnu39`_JQ zb*3M7ZnuwzF29V8OoGXPFG8weTNkSn{Ip$62NDe|noRVVBGfDaQ~(phTpSNcGNtKU z5FS)@Z`-FZ{IuDix+b~BQY2WF5=>fl89n5zRPfePR4A)T%MWJR*%VK*@>0+k#o`TD za$_~#n48iq+py_Y?Xc}HH7>$J1HuL>06N9^4I%GnqZZv(PkJvO(*`}L%);VHUuF_r z*jiHMX>DYkGVfeOW1U^v0-YOt!PAV+@wO=WnwD7B+V^)!Qg1eGS@y@{IF1NN7w8P* zwzyQ0+JUiqDLxzd;8$aMoOZ+G>4L5q9Onr_rj{DRT7uvyYHZHKf?cxOZ+BhOPQ3`G zf_WMqnpEmA>p(1Gtys)Pa$6*=loDh)0N zD-lW=Iu(!x$R$w1p7(4yIkw1Eq* z#gtHU$}DNO6VlNrCcnC5hsUxvr9 z0_p%En7wAuX-r1J-0+0PVz#s6%zvpD$ P8^GyLf`FzfCtR#t=rdXEYICc;ONs?{1 zWz!tGZWu?71yKN1xiO5{YDKvo8%9Ess++A@)y}?+PUl==FkQH@6~fo4*rGFsdkmyH z(f3=s+l76XUxr2|!DPS{A=a>sjnxr;+|0&3iFy`|CVGkyYUThcfQex?j{77T({wHf zkE*&`E|0$dCCgAy;*ikiYHllE@+Hm@rEtg zp&DjpR@!CjH{H7JH>XRDi!jrGSOVn%9bERN zE>)zqXO<@^JR5oMRzrLkxBb)cf^HZb=Ltfl<{HCVg5W4>Xim$#ZM5EPwq4VXClO2q zb2QvHsd&Yto>+uhl`eOMf2`B~*o@;BBm(FF4nPc00PFzH7@!HNgggfoIqHro4K@dB z5lR_46_5tVCQ!toTt(#y?L*Y%a6LQ^iUhiftt`TKnRP60a;vI>wk`U;MUxk~1kSq= zV?xa-v!v}#hzFw>-RhF;pUM+D4)hFo3X@sf5UG{Mc}pesSNYnnignu*eb=Dz#48Fa z0d;^7OkNY{I3xpaB7B-mNY7_yzn_R?7}{!Od7jO&0na8PS4do~um_dt^*J&r7Nf%`|6iB4;p;?`S16W`1=0#ySLB(uojD-Cj9( Date: Tue, 24 Jul 2018 21:09:34 +0200 Subject: [PATCH 5/6] Amend changelog --- distribution/changelog.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index c60ba6feaf..2cf9059f8a 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -4,7 +4,7 @@ - Feature: [#6998] Guests now wait for passing vehicles before crossing railway tracks. - Feature: [#7694] Debug option to visualize paths that the game detects as wide. - Feature: [#7771] Danish translation. -- Feature: [#7802] Add sprite font glyphs for Russian. +- Feature: [#7797, #7802, #7821] Add sprite font glyphs for Danish, Norwegian, Russian, Turkish and Catalan. - Fix: [#3177] Wrong keys displayed in shortcut menu. - Fix: [#4039] Add sprite font glyph for German opening quotation mark. - Fix: [#7533] Screenshot is incorrectly named/file is not generated in CJK language. @@ -23,7 +23,6 @@ - Fix: [#7773] Once research has been completed, player is still charged for research. - Fix: [#7786] Crash when importing a track design. - Fix: [#7793] Duplicate private keys generated. -- Fix: [#7797] Add sprite font glyphs for Æ and Ø, needed for Norwegian and Danish. 0.2.0 (2018-06-10) ------------------------------------------------------------------------ From c48e204813881333ae15a11652d55c3b3f3ec8c6 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 24 Jul 2018 21:32:00 +0200 Subject: [PATCH 6/6] Add #7817 to changelog [ci skip] --- distribution/changelog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 2cf9059f8a..f11e482ba0 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -6,7 +6,7 @@ - Feature: [#7771] Danish translation. - Feature: [#7797, #7802, #7821] Add sprite font glyphs for Danish, Norwegian, Russian, Turkish and Catalan. - Fix: [#3177] Wrong keys displayed in shortcut menu. -- Fix: [#4039] Add sprite font glyph for German opening quotation mark. +- Fix: [#4039] No sprite font glyph for German opening quotation mark. - Fix: [#7533] Screenshot is incorrectly named/file is not generated in CJK language. - Fix: [#7628] Always-researched items can be modified in the inventory list. - Fix: [#7643] No Money scenarios with funding set to zero. @@ -23,6 +23,7 @@ - Fix: [#7773] Once research has been completed, player is still charged for research. - Fix: [#7786] Crash when importing a track design. - Fix: [#7793] Duplicate private keys generated. +- Fix: [#7817] No sprite font glyph for interpunct. 0.2.0 (2018-06-10) ------------------------------------------------------------------------