From 43d4a20b797bf38373aec75e8ae7304925f897f6 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 24 Feb 2019 22:31:02 +0100 Subject: [PATCH 1/9] Add N with caron --- resources/g2/font/latin/n-caron-bold.png | Bin 0 -> 171 bytes resources/g2/font/latin/n-caron-small.png | Bin 0 -> 171 bytes resources/g2/font/latin/n-caron-tiny.png | Bin 0 -> 172 bytes resources/g2/font/latin/n-caron-uc-bold.png | Bin 0 -> 193 bytes resources/g2/font/latin/n-caron-uc-small.png | Bin 0 -> 183 bytes resources/g2/font/latin/n-caron-uc-tiny.png | Bin 0 -> 179 bytes resources/g2/sprites.json | 36 +++++++++++++++++++ src/openrct2/drawing/Font.cpp | 2 ++ src/openrct2/sprites.h | 5 ++- 9 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/latin/n-caron-bold.png create mode 100644 resources/g2/font/latin/n-caron-small.png create mode 100644 resources/g2/font/latin/n-caron-tiny.png create mode 100644 resources/g2/font/latin/n-caron-uc-bold.png create mode 100644 resources/g2/font/latin/n-caron-uc-small.png create mode 100644 resources/g2/font/latin/n-caron-uc-tiny.png diff --git a/resources/g2/font/latin/n-caron-bold.png b/resources/g2/font/latin/n-caron-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..438634bc254c5895c4f2909b5cf319c1d7152c60 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?LJV?mi&u1ysY}>FVdQ I&MBb@04`xFpa1{> literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/n-caron-small.png b/resources/g2/font/latin/n-caron-small.png new file mode 100644 index 0000000000000000000000000000000000000000..97630bad3d0d516a9ed752d86b4dad253978c801 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ##0(@~B^+M>q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?Iev=AsH>FMGa!f`$MLPElfa|akymKz$Jv0-pM#=~H7jdjn`j5sr(A_h-a KKbLh*2~7akGA#`N literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/n-caron-uc-bold.png b/resources/g2/font/latin/n-caron-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..ae2f8b59763fb1c55062036a850266bfe7bb6e4b GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRY#0(@anEQ7CDV_kI5Z6@Q^bUsq{~0=rjsLg* z{Tl-mXDkWw3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=fu;z9FeAgPITAoY_7YEDSN6wD z5~4z;?T4+t1BLWFT^vI=t|uo1B_uqUbNIl5(4z+o-o9jPTj||s@s;85mJ7^0mzOhb f)MB~)!I*(T;XR+J|CHEGK%ESpu6{1-oD!M_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?c#9>E@pFSS-H9`d*;{yc7`m7_ VC!7wo@&&4A@O1TaS?83{1OP>BF2n!; literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/n-caron-uc-tiny.png b/resources/g2/font/latin/n-caron-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..5d61b21ac304b89f93ba96d00aa007d4cb37b0c7 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJx#0(^tuSi=Bq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW? codepointOffsetMap = { { UnicodeChar::l_stroke, CSChar::l_stroke - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::n_acute_uc, CSChar::n_acute_uc - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::n_acute, CSChar::n_acute - CS_SPRITE_FONT_OFFSET }, + { UnicodeChar::n_caron_uc, SPR_G2_N_CARON_UPPER - SPR_CHAR_START }, + { 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::s_acute_uc, CSChar::s_acute_uc - CS_SPRITE_FONT_OFFSET }, diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 392638a413..cad340541b 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -917,8 +917,11 @@ 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_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 74, + SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 76, SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, From fd1f763b83f91a172da60cb172231d71b642335c Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 24 Mar 2019 21:57:56 +0100 Subject: [PATCH 2/9] 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?&Xw25&~=wFepAZHaO$x#Kyzm{g_p5`Mdlupc)2GS3j3^ HP6oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?;_iv_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!JQ zB}9}}6T0)30fkgOT^vI=t|vc;Iq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?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? 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, From ef5472c5665857dca69bb6632030d5f827a44756 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 25 Mar 2019 16:15:33 +0100 Subject: [PATCH 3/9] 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, From 92d348fe43ef4eae1e2e27d3c99118c8b1271273 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 25 Mar 2019 16:51:47 +0100 Subject: [PATCH 4/9] Add T with caron --- resources/g2/font/latin/t-caron-bold.png | Bin 0 -> 186 bytes resources/g2/font/latin/t-caron-small.png | Bin 0 -> 180 bytes resources/g2/font/latin/t-caron-tiny.png | Bin 0 -> 176 bytes resources/g2/font/latin/t-caron-uc-bold.png | Bin 0 -> 177 bytes resources/g2/font/latin/t-caron-uc-small.png | Bin 0 -> 177 bytes resources/g2/font/latin/t-caron-uc-tiny.png | Bin 0 -> 170 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/g2/font/latin/t-caron-bold.png create mode 100644 resources/g2/font/latin/t-caron-small.png create mode 100644 resources/g2/font/latin/t-caron-tiny.png create mode 100644 resources/g2/font/latin/t-caron-uc-bold.png create mode 100644 resources/g2/font/latin/t-caron-uc-small.png create mode 100644 resources/g2/font/latin/t-caron-uc-tiny.png diff --git a/resources/g2/font/latin/t-caron-bold.png b/resources/g2/font/latin/t-caron-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..ec6823604cf867c8dcc00fef7a1eb54618da7d3f GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?zopr01hHDoB#j- literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/t-caron-small.png b/resources/g2/font/latin/t-caron-small.png new file mode 100644 index 0000000000000000000000000000000000000000..bbfd511a1292d2c2f4d77f333609d666fe3f9218 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ(#0(^JzHH?KQak}ZA+D*q=^YIJ|1)$L8~<_!@hljQC0!qCAg>jC6&7I;J!Gca%qgD@k*tT_@uLG}_)Usv|W z%#!@V3h5c`dO#sXPZ!4!j_b(*83{8&4;ZX%NIb{bX33*q(%tCzm4VrwnIUrq+hu>v Rjio@v44$rjF6*2UngGz$Ew=yw literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/t-caron-tiny.png b/resources/g2/font/latin/t-caron-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..10ce1357367126221cacaefdaa8f9ddccdd57601 GIT binary patch literal 176 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|W z%#!>P;x>xEUjc<=JzX3_IIbrLBqhwKY)G_XJ}kr5CdtF|iigLBhe5ZTx$1wiXaZ0n NgQu&X%Q~loCIB#MD`)@! literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/t-caron-uc-bold.png b/resources/g2/font/latin/t-caron-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..8ffebc1330ede97bb07a4eeeda4fea1a18126995 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^96-#?#0(_uzp88lQak}ZA+D*q=^YIJ|1)$L8~<_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!JQ zCHciI1Tt>b0EOf{T^vI=t|vc;I_E)T#0(_Q{j0YIQak}ZA+D*q=^YIJ|1)$L8~<_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!JQ zCHckqS6rpPt45E8AXnqVPNR6V*hga#=R(@ ON(N6?KbLh*2~7a;H89Bl literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/t-caron-uc-tiny.png b/resources/g2/font/latin/t-caron-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..9b3a0219503e19b5b0f4ff0a98b2d5986263a040 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?g{`Dpb`d8S3j3^ HP6 Date: Mon, 25 Mar 2019 16:51:27 +0100 Subject: [PATCH 5/9] Add U with ring --- resources/g2/font/latin/u-ring-bold.png | Bin 0 -> 180 bytes resources/g2/font/latin/u-ring-small.png | Bin 0 -> 174 bytes resources/g2/font/latin/u-ring-tiny.png | Bin 0 -> 172 bytes resources/g2/font/latin/u-ring-uc-bold.png | Bin 0 -> 194 bytes resources/g2/font/latin/u-ring-uc-small.png | Bin 0 -> 184 bytes resources/g2/font/latin/u-ring-uc-tiny.png | Bin 0 -> 171 bytes resources/g2/sprites.json | 72 ++++++++++++++++++++ src/openrct2/drawing/Font.cpp | 4 ++ src/openrct2/sprites.h | 6 +- 9 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/latin/u-ring-bold.png create mode 100644 resources/g2/font/latin/u-ring-small.png create mode 100644 resources/g2/font/latin/u-ring-tiny.png create mode 100644 resources/g2/font/latin/u-ring-uc-bold.png create mode 100644 resources/g2/font/latin/u-ring-uc-small.png create mode 100644 resources/g2/font/latin/u-ring-uc-tiny.png diff --git a/resources/g2/font/latin/u-ring-bold.png b/resources/g2/font/latin/u-ring-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..d818014dcfd5bd6e7f3862b1f55b7dbef1f6610e GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)T#0(_Q{j0YIQak}ZA+D*q=^YIJ|1)$L8~<_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!JQ zCHWPsCDXJ&0fiJjT^vI=t|uoXB|NY>upsQff}IVCQ9Mk(y@>(32@mWU7^(s|JQm1p RxC&Iv;OXk;vd$@?2>?uvFV_G7 literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-ring-small.png b/resources/g2/font/latin/u-ring-small.png new file mode 100644 index 0000000000000000000000000000000000000000..3f3afb46589ec9199c654c5a7e3e08d47c34104b GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ##0(@~B^+M>q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?3p^r=fu;z9FeAgPITAoY_7YEDSN6xu zlKd*Vo%f=b1BLWGT^vI=t|upCBqStwB_v#!bM%0L?N^4wUzR(p;W~JEnq0yRsj3D? g(>aZe|M{62#NYEC+Agm10jQP1)78&qol`;+08xWC=>Px# literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-ring-uc-small.png b/resources/g2/font/latin/u-ring-uc-small.png new file mode 100644 index 0000000000000000000000000000000000000000..581629045c9a925153750c62e1404949154f7973 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^96-#?#0(_uzp88lQak}ZA+D*q=^YIJ|1)$L8~<_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!JQ zCHeJDE8V25fI_OCE{-7_*OL>n5+3Lz1k66TAo`%ef6K!%r2?}So?BqXu5zx1fuY%p VL&NoY^-`b)22WQ%mvv4FO#sa$F;M^j literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-ring-uc-tiny.png b/resources/g2/font/latin/u-ring-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..908bb602141f0f58343721d69cd17c70a27a45e4 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? codepointOffsetMap = { { 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::t_caron_uc, SPR_G2_T_CARON_UPPER - SPR_CHAR_START }, + { UnicodeChar::t_caron, SPR_G2_T_CARON_LOWER - SPR_CHAR_START }, + { UnicodeChar::u_ring_uc, SPR_G2_U_RING_UPPER - SPR_CHAR_START }, + { UnicodeChar::u_ring, SPR_G2_U_RING_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 0fbf162cdf..9600cc522c 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -923,8 +923,12 @@ enum SPR_G2_R_CARON_LOWER = SPR_G2_CHAR_BEGIN + 77, SPR_G2_S_CARON_UPPER = SPR_G2_CHAR_BEGIN + 78, SPR_G2_S_CARON_LOWER = SPR_G2_CHAR_BEGIN + 79, + SPR_G2_T_CARON_UPPER = SPR_G2_CHAR_BEGIN + 80, + SPR_G2_T_CARON_LOWER = SPR_G2_CHAR_BEGIN + 81, + SPR_G2_U_RING_UPPER = SPR_G2_CHAR_BEGIN + 82, + SPR_G2_U_RING_LOWER = SPR_G2_CHAR_BEGIN + 83, - SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 80, + SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 84, SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, From ff12d5c2028b2375ca1e70e48adc16f2e9142e54 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 25 Mar 2019 17:02:35 +0100 Subject: [PATCH 6/9] Add Z with caron --- resources/g2/font/latin/z-caron-bold.png | Bin 0 -> 180 bytes resources/g2/font/latin/z-caron-small.png | Bin 0 -> 182 bytes resources/g2/font/latin/z-caron-tiny.png | Bin 0 -> 171 bytes resources/g2/font/latin/z-caron-uc-bold.png | Bin 0 -> 190 bytes resources/g2/font/latin/z-caron-uc-small.png | Bin 0 -> 185 bytes resources/g2/font/latin/z-caron-uc-tiny.png | Bin 0 -> 176 bytes resources/g2/sprites.json | 36 +++++++++++++++++++ src/openrct2/drawing/Font.cpp | 2 ++ src/openrct2/sprites.h | 4 ++- 9 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/latin/z-caron-bold.png create mode 100644 resources/g2/font/latin/z-caron-small.png create mode 100644 resources/g2/font/latin/z-caron-tiny.png create mode 100644 resources/g2/font/latin/z-caron-uc-bold.png create mode 100644 resources/g2/font/latin/z-caron-uc-small.png create mode 100644 resources/g2/font/latin/z-caron-uc-tiny.png diff --git a/resources/g2/font/latin/z-caron-bold.png b/resources/g2/font/latin/z-caron-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..f4a69f936d7f69d88b57e1c98aa7d88eb6bd2294 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?q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?J+R>F0fVg#2iG+;er9O4Vm_>6aQz_!@hljQC0!qCAg>jC6&7I;J!Gca%qgD@k*tT_@uLG}_)Usv|W z%#!@(jJIBvT>}b9c)B=-a9mG*kdP3NoG_!R;ov8RDT(J97}Qp?m}~FRGY6_+@O1Ta JS?83{1OUqvEiM26 literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/z-caron-uc-bold.png b/resources/g2/font/latin/z-caron-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..9503ac8284e8fde101cd577124e73162390a3c9b GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRY#0(@anEQ7CDV_kI5Z6@Q^bUsq{~0=rjsLg* z{Tl-mXDkWw3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=fu;z9FeAgPITAoY_7YEDSN6xu zlKf`sg8vU?0fn?ZT^vI=t|vc;I(T4#)VTu-wstipX1!o!`@ND~Vn##FIf(@oVlF&7 c|K>9?+=}2_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!JQ zCHYN_!ud;`fI@1XE{-7_*OMPa9atcBc)`}D#4L;Ezr}3JEP3Xz^1Nb~NON@g$H36d Wz**kAaP=Ob4hBzGKbLh*2~7Y2fH8ak literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/z-caron-uc-tiny.png b/resources/g2/font/latin/z-caron-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..5bff847a48c20cc805e6c02baa8abba4648329bc GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?p0+YJlFz;kcgsAR!?jIblXs!@*As%~s5ZbqsFLV`MPSXSuZZdnCvz N22WQ%mvv4FO#sRHFg*YO literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 394671e5e5..f1b78eacbb 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -856,6 +856,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/z-caron-uc-small.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/z-caron-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-small.png", "y_offset": 0, @@ -1325,6 +1337,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/z-caron-uc-bold.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/z-caron-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-bold.png", "y_offset": 0, @@ -1802,6 +1826,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/z-caron-uc-tiny.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/z-caron-tiny.png", + "y_offset": 0, + "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 ccbce487d6..4700057ab9 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -79,6 +79,8 @@ static const std::map codepointOffsetMap = { { UnicodeChar::z_acute, CSChar::z_acute - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::z_dot_uc, CSChar::z_dot_uc - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::z_dot, CSChar::z_dot - CS_SPRITE_FONT_OFFSET }, + { UnicodeChar::z_caron_uc, SPR_G2_Z_CARON_UPPER - SPR_CHAR_START }, + { UnicodeChar::z_caron, SPR_G2_Z_CARON_LOWER - SPR_CHAR_START }, { UnicodeChar::f_with_hook_uc, 'F' - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::s_comma_uc, SPR_G2_S_CEDILLA_UPPER - SPR_CHAR_START }, // No visual difference { UnicodeChar::s_comma, SPR_G2_S_CEDILLA_LOWER - SPR_CHAR_START }, // Ditto diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 9600cc522c..2cfec914c0 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -927,8 +927,10 @@ enum SPR_G2_T_CARON_LOWER = SPR_G2_CHAR_BEGIN + 81, SPR_G2_U_RING_UPPER = SPR_G2_CHAR_BEGIN + 82, SPR_G2_U_RING_LOWER = SPR_G2_CHAR_BEGIN + 83, + SPR_G2_Z_CARON_UPPER = SPR_G2_CHAR_BEGIN + 84, + SPR_G2_Z_CARON_LOWER = SPR_G2_CHAR_BEGIN + 85, - SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 84, + SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 86, SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, From bbfa2570d5c3ae7b82b3ba20a653bd55cf457423 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 25 Mar 2019 17:03:12 +0100 Subject: [PATCH 7/9] Switch Czech to sprite font --- 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 bdf2eb3604..cca9d7428b 100644 --- a/src/openrct2/localisation/Language.cpp +++ b/src/openrct2/localisation/Language.cpp @@ -28,7 +28,7 @@ const language_descriptor LanguagesDescriptors[LANGUAGE_COUNT] = { "ca-ES", "Catalan", u8"Català", FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_CATALAN { "zh-CN", "Chinese (Simplified)", "Chinese (Simplified)", FAMILY(&TTFFamilyChineseSimplified), false }, // LANGUAGE_CHINESE_SIMPLIFIED { "zh-TW", "Chinese (Traditional)", "Chinese (Traditional)", FAMILY(&TTFFamilyChineseTraditional), false }, // LANGUAGE_CHINESE_TRADITIONAL - { "cs-CZ", "Czech", "Czech", FAMILY(&TTFFamilySansSerif), false }, // LANGUAGE_CZECH + { "cs-CZ", "Czech", u8"Čeština", FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_CZECH { "da-DK", "Danish", "Dansk", FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_DANISH { "de-DE", "German", "Deutsch", FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_GERMAN { "en-GB", "English (UK)", "English (UK)", FAMILY_OPENRCT2_SPRITE, false }, // LANGUAGE_ENGLISH_UK From 7f045918e18474974b7e28ee3e6f6203c174756c Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 25 Mar 2019 17:24:27 +0100 Subject: [PATCH 8/9] Fix formatting --- src/openrct2/sprites.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 2cfec914c0..50b8d1ec3b 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -929,7 +929,7 @@ enum SPR_G2_U_RING_LOWER = SPR_G2_CHAR_BEGIN + 83, SPR_G2_Z_CARON_UPPER = SPR_G2_CHAR_BEGIN + 84, SPR_G2_Z_CARON_LOWER = SPR_G2_CHAR_BEGIN + 85, - + SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 86, SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, From ee6cee99ced85e3ea8f7a089411e5ce917a713a0 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 27 Mar 2019 10:07:30 +0100 Subject: [PATCH 9/9] Update changelog --- distribution/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index e692bef16e..5b18c26b12 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -2,6 +2,7 @@ ------------------------------------------------------------------------ - Feature: [#7296] Allow assigning a keyboard shortcut for the scenery picker. - Feature: [#8919] Allow setting ride price from console. +- Feature: [#8963] Add missing Czech letters to sprite font, use sprite font for Czech. - Change: [#8688] Move common actions from debug menu into cheats menu. - Fix: [#5579] Network desync immediately after connecting. - Fix: [#6006] Objects higher than 6 metres are considered trees (original bug).