diff --git a/CMakeLists.txt b/CMakeLists.txt index 0661ea255..2f9b66251 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1010,9 +1010,9 @@ set(EXPECTED_DATA editor/winter_main.rules emoticons.png file_icons.png - fonts/DejaVuSansCJKName.ttf + fonts/DejaVuSans.ttf fonts/Icons.ttf - fonts/WenQuanYiMicroHei.ttf + fonts/SourceHanSansSC-Regular.otf game.png gui_buttons.png gui_cursor.png @@ -1255,7 +1255,7 @@ set(EXPECTED_DATA wordlist.txt ) -set_glob(DATA GLOB_RECURSE "frag;json;map;pem;png;rules;ttf;txt;vert;wv" data ${EXPECTED_DATA}) +set_glob(DATA GLOB_RECURSE "frag;json;map;otf;png;rules;ttf;txt;vert;wv" data ${EXPECTED_DATA}) ######################################################################## # COPY DATA AND DLLS diff --git a/data/fonts/DejaVuSansCJKName.ttf b/data/fonts/DejaVuSans.ttf similarity index 100% rename from data/fonts/DejaVuSansCJKName.ttf rename to data/fonts/DejaVuSans.ttf diff --git a/data/fonts/SourceHanSansSC-Regular.otf b/data/fonts/SourceHanSansSC-Regular.otf new file mode 100644 index 000000000..88e3a3546 Binary files /dev/null and b/data/fonts/SourceHanSansSC-Regular.otf differ diff --git a/data/fonts/WenQuanYiMicroHei.ttf b/data/fonts/WenQuanYiMicroHei.ttf deleted file mode 100644 index 64e551cdf..000000000 Binary files a/data/fonts/WenQuanYiMicroHei.ttf and /dev/null differ diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 3b184a85f..1e65b5239 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -3839,8 +3839,8 @@ void CClient::LoadFont() static CFont *pDefaultFont = 0; static CFont *pFallbackFont = 0; char aFilename[512]; - const char *pFontFile = "fonts/DejaVuSansCJKName.ttf"; - const char *pFallbackFontFile = "fonts/WenQuanYiMicroHei.ttf"; + const char *pFontFile = "fonts/DejaVuSans.ttf"; + const char *pFallbackFontFile = "fonts/SourceHanSansSC-Regular.otf"; IOHANDLE File = Storage()->OpenFile(pFontFile, IOFLAG_READ, IStorage::TYPE_ALL, aFilename, sizeof(aFilename)); if(File) {