From ad3528a7f18a9fc20641a695f8f73599ee0144eb Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 23 Jul 2018 23:42:07 +0200 Subject: [PATCH] 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