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

fix compile warning

Browse source
This commit is contained in:
Tom 2016-03-03 23:40:19 +08:00
parent 26a1a9f331
commit ff1c6705d6
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/client/components/menus_settings.cpp
View file

@ -1155,11 +1155,11 @@ void CMenus::RenderLanguageSelection(CUIRect MainView)
// Load Font // Load Font
static CFont *pDefaultFont = 0; static CFont *pDefaultFont = 0;
char aFilename[512]; char aFilename[512];
char *fontFile = "fonts/DejaVuSansCJKName.ttf"; const char *pFontFile = "fonts/DejaVuSansCJKName.ttf";
if (str_find(g_Config.m_ClLanguagefile, "chinese") != NULL || str_find(g_Config.m_ClLanguagefile, "japanese") != NULL || 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) str_find(g_Config.m_ClLanguagefile, "korean") != NULL)
fontFile = "fonts/DejavuWenQuanYiMicroHei.ttf"; pFontFile = "fonts/DejavuWenQuanYiMicroHei.ttf";
IOHANDLE File = Storage()->OpenFile(fontFile, IOFLAG_READ, IStorage::TYPE_ALL, aFilename, sizeof(aFilename)); IOHANDLE File = Storage()->OpenFile(pFontFile, IOFLAG_READ, IStorage::TYPE_ALL, aFilename, sizeof(aFilename));
if(File) if(File)
{ {
io_close(File); io_close(File);
@ -1167,7 +1167,7 @@ void CMenus::RenderLanguageSelection(CUIRect MainView)
TextRender()->SetDefaultFont(pDefaultFont); TextRender()->SetDefaultFont(pDefaultFont);
} }
if(!pDefaultFont) if(!pDefaultFont)
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "gameclient", "failed to load font. filename='%s'", fontFile); Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "gameclient", "failed to load font. filename='%s'", pFontFile);
} }
} }

8
src/game/client/gameclient.cpp
View file

@ -294,11 +294,11 @@ void CGameClient::OnInit()
// load default font // load default font
static CFont *pDefaultFont = 0; static CFont *pDefaultFont = 0;
char aFilename[512]; char aFilename[512];
char *fontFile = "fonts/DejaVuSansCJKName.ttf"; const char *pFontFile = "fonts/DejaVuSansCJKName.ttf";
if (str_find(g_Config.m_ClLanguagefile, "chinese") != NULL || str_find(g_Config.m_ClLanguagefile, "japanese") != NULL || 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) str_find(g_Config.m_ClLanguagefile, "korean") != NULL)
fontFile = "fonts/DejavuWenQuanYiMicroHei.ttf"; pFontFile = "fonts/DejavuWenQuanYiMicroHei.ttf";
IOHANDLE File = Storage()->OpenFile(fontFile, IOFLAG_READ, IStorage::TYPE_ALL, aFilename, sizeof(aFilename)); IOHANDLE File = Storage()->OpenFile(pFontFile, IOFLAG_READ, IStorage::TYPE_ALL, aFilename, sizeof(aFilename));
if(File) if(File)
{ {
io_close(File); io_close(File);
@ -306,7 +306,7 @@ void CGameClient::OnInit()
TextRender()->SetDefaultFont(pDefaultFont); TextRender()->SetDefaultFont(pDefaultFont);
} }
if(!pDefaultFont) if(!pDefaultFont)
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "gameclient", "failed to load font. filename='%s'", fontFile); Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "gameclient", "failed to load font. filename='%s'", pFontFile);
// init all components // init all components
for(int i = m_All.m_Num-1; i >= 0; --i) for(int i = m_All.m_Num-1; i >= 0; --i)