From dd4f5ff93bd6bfc33e56c5233c13f1d8a071763d Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sat, 28 Oct 2017 11:32:06 +0200 Subject: [PATCH] Use 'STHeiti' for Chinese (Simplified) on macOS. --- src/openrct2/interface/FontFamilies.cpp | 1 + src/openrct2/interface/Fonts.cpp | 7 +++++++ src/openrct2/interface/Fonts.h | 1 + 3 files changed, 9 insertions(+) diff --git a/src/openrct2/interface/FontFamilies.cpp b/src/openrct2/interface/FontFamilies.cpp index 675b33177c..11d94025c8 100644 --- a/src/openrct2/interface/FontFamilies.cpp +++ b/src/openrct2/interface/FontFamilies.cpp @@ -21,6 +21,7 @@ TTFontFamily const TTFFamilyChineseSimplified = { &TTFFontMingLiu, + &TTFFontHeiti, }; TTFontFamily const TTFFamilyChineseTraditional = diff --git a/src/openrct2/interface/Fonts.cpp b/src/openrct2/interface/Fonts.cpp index 1c5d6ea8ba..943ef32283 100644 --- a/src/openrct2/interface/Fonts.cpp +++ b/src/openrct2/interface/Fonts.cpp @@ -50,6 +50,13 @@ TTFFontSetDescriptor TTFFontMingLiu = { { { "mingliu.ttc", "MingLiU", 13, 1, 0, 15, HINTING_THRESHOLD_MEDIUM, nullptr }, } }; +TTFFontSetDescriptor TTFFontHeiti = { { + { u8"华文黑体.ttf", "STHeiti", 9, -1, -3, 6, HINTING_THRESHOLD_MEDIUM, nullptr }, + { u8"华文黑体.ttf", "STHeiti", 11, 1, 1, 14, HINTING_THRESHOLD_MEDIUM, nullptr }, + { u8"华文黑体.ttf", "STHeiti", 12, 1, 0, 15, HINTING_THRESHOLD_MEDIUM, nullptr }, + { u8"华文黑体.ttf", "STHeiti", 13, 1, 0, 15, HINTING_THRESHOLD_MEDIUM, nullptr }, +} }; + TTFFontSetDescriptor TTFFontSimSun = { { { "msyh.ttc", "YaHei", 9, -1, -3, 6, HINTING_THRESHOLD_MEDIUM, nullptr }, { "simsun.ttc", "SimSun", 11, 1, -1, 14, HINTING_THRESHOLD_MEDIUM, nullptr }, diff --git a/src/openrct2/interface/Fonts.h b/src/openrct2/interface/Fonts.h index df51f6080a..02ca78c319 100644 --- a/src/openrct2/interface/Fonts.h +++ b/src/openrct2/interface/Fonts.h @@ -23,6 +23,7 @@ extern TTFFontSetDescriptor TTFFontMSGothic; extern TTFFontSetDescriptor TTFFontHiragano; extern TTFFontSetDescriptor TTFFontMingLiu; +extern TTFFontSetDescriptor TTFFontHeiti; extern TTFFontSetDescriptor TTFFontSimSun; extern TTFFontSetDescriptor TTFFontLiHeiPro; extern TTFFontSetDescriptor TTFFontGulim;