edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-05 15:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge DejaVuSansCJKName with DejavuWenQuanYiMicroHei and use it for all (fixes #2593)

Browse source 
got them merged with fontforge, finally looks good.

allows reading CJK for everyone independent of language chosen.

Hopefully the lags are gone.
This commit is contained in:
def 2020-08-19 12:25:17 +02:00
parent 4611c8f101
commit 1394ac0fc4
4 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -1010,7 +1010,6 @@ set(EXPECTED_DATA
editor/winter_main.rules
emoticons.png
file_icons.png
fonts/DejaVuSansCJKName.ttf
fonts/DejavuWenQuanYiMicroHei.ttf
fonts/Icons.ttf
game.png

BIN
data/fonts/DejaVuSansCJKName.ttf
View file

Binary file not shown.

BIN
data/fonts/DejavuWenQuanYiMicroHei.ttf
View file

Binary file not shown.

5
src/engine/client/client.cpp
View file

@ -3838,10 +3838,7 @@ void CClient::LoadFont()
{
static CFont *pDefaultFont = 0;
char aFilename[512];
const char *pFontFile = "fonts/DejaVuSansCJKName.ttf";
if(str_find(g_Config.m_ClLanguagefile, "chinese") != NULL || str_find(g_Config.m_ClLanguagefile, "japanese") != NULL ||
str_find(g_Config.m_ClLanguagefile, "korean") != NULL)
pFontFile = "fonts/DejavuWenQuanYiMicroHei.ttf";
const char *pFontFile = "fonts/DejavuWenQuanYiMicroHei.ttf";
IOHANDLE File = Storage()->OpenFile(pFontFile, IOFLAG_READ, IStorage::TYPE_ALL, aFilename, sizeof(aFilename));
if(File)
{