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

Switch to Source Han Sans font

Browse source
This commit is contained in:
def 2020-08-20 11:21:45 +02:00
parent 446526486d
commit 178d864ec9
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -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

0
data/fonts/DejaVuSansCJKName.ttf → data/fonts/DejaVuSans.ttf
View file

BIN
data/fonts/SourceHanSansSC-Regular.otf Normal file
View file

Binary file not shown.

BIN
data/fonts/WenQuanYiMicroHei.ttf
View file

Binary file not shown.

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

@ -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)
{