From ef5472c5665857dca69bb6632030d5f827a44756 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 25 Mar 2019 16:15:33 +0100 Subject: [PATCH] Add S with caron --- resources/g2/font/latin/s-caron-bold.png | Bin 0 -> 183 bytes resources/g2/font/latin/s-caron-small.png | Bin 0 -> 178 bytes resources/g2/font/latin/s-caron-tiny.png | Bin 0 -> 179 bytes resources/g2/font/latin/s-caron-uc-bold.png | Bin 0 -> 187 bytes resources/g2/font/latin/s-caron-uc-small.png | Bin 0 -> 182 bytes resources/g2/font/latin/s-caron-uc-tiny.png | Bin 0 -> 173 bytes resources/g2/sprites.json | 36 +++++++++++++++++++ src/openrct2/drawing/Font.cpp | 2 ++ src/openrct2/sprites.h | 6 ++-- 9 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 resources/g2/font/latin/s-caron-bold.png create mode 100644 resources/g2/font/latin/s-caron-small.png create mode 100644 resources/g2/font/latin/s-caron-tiny.png create mode 100644 resources/g2/font/latin/s-caron-uc-bold.png create mode 100644 resources/g2/font/latin/s-caron-uc-small.png create mode 100644 resources/g2/font/latin/s-caron-uc-tiny.png diff --git a/resources/g2/font/latin/s-caron-bold.png b/resources/g2/font/latin/s-caron-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..14600a8dce2e550d369071446db76f492ae0c83a GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?)AK;}44$rjF6*2UngF%aG1UM7 literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/s-caron-small.png b/resources/g2/font/latin/s-caron-small.png new file mode 100644 index 0000000000000000000000000000000000000000..073d4d9c0f32c37cc0565230cf3039b6a3b48c3d GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ##0(@~B^+M>q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?FVdQ&MBb@0OYDJod5s; literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/s-caron-tiny.png b/resources/g2/font/latin/s-caron-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b358aeac5fb0df95fc5abf7a7fbc6a4054f8e3 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?fx8LV)c7gWg8R&kTo4*x01m7!)=#7oG~9 RYz>P)FIWHo literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/s-caron-uc-bold.png b/resources/g2/font/latin/s-caron-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..e46b2b1bb26fb740189a89ee2dc74515a742dcba GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^96-#?#0(_uzp88lQak}ZA+D*q=^YIJ|1)$L8~<_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!JQ zCHYyc+9sWD1`26-x;Tb#Tu)AjI&eVp@PVyOj;3=GZ%MVS6jW%tR?@ceAy06!#2b4C ZhT5kb>$;A1-2&=i@O1TaS?83{1OVn6HLm~w literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/s-caron-uc-small.png b/resources/g2/font/latin/s-caron-uc-small.png new file mode 100644 index 0000000000000000000000000000000000000000..aef1fb5e4d25beb4efd0084a2fd883dcb93d62d2 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ-#0(@AZA4gs6i&Xw25&~=wFeph&q=_1=kWILdlQ1KkA&L3uPf3QHGoac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?D>e*DZzUOQ-m`vq&aiPUP!)rx LtDnm{r-UW|CKfK* literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index bec93c5b82..f00aae5fac 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -820,6 +820,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/s-caron-uc-small.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/s-caron-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-small.png", "y_offset": 0, @@ -1253,6 +1265,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/s-caron-uc-bold.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/s-caron-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-bold.png", "y_offset": 0, @@ -1694,6 +1718,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/s-caron-uc-tiny.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/s-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 735ca267d1..ded9cf5358 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -67,6 +67,8 @@ static const std::map codepointOffsetMap = { { UnicodeChar::s_acute, CSChar::s_acute - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::s_cedilla_uc, SPR_G2_S_CEDILLA_UPPER - SPR_CHAR_START }, { 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::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 98af5976f7..0fbf162cdf 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -921,8 +921,10 @@ enum 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 + 78, + SPR_G2_S_CARON_UPPER = SPR_G2_CHAR_BEGIN + 78, + SPR_G2_S_CARON_LOWER = SPR_G2_CHAR_BEGIN + 79, + + SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 80, SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1,