Skip to content

Y
ygopro
Commit dcd83cdb authored by nanahira's avatar nanahira
Browse files
Options

merge

parents 2de526c4 9fd07978
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
gframe/game.cpp
View file @ dcd83cdb
...@@ -93,12 +93,12 @@ bool Game::Initialize() { ...@@ -93,12 +93,12 @@ bool Game::Initialize() {
ErrorLog("Failed to load card database (cards.cdb)!"); ErrorLog("Failed to load card database (cards.cdb)!");
return false; return false;
} }
LoadExpansionStrings();
if(dataManager.LoadStrings(GetLocaleDir("strings.conf"))) {} else if(dataManager.LoadStrings(GetLocaleDir("strings.conf"))) {} else
if(!dataManager.LoadStrings("strings.conf")) { if(!dataManager.LoadStrings("strings.conf")) {
ErrorLog("Failed to load strings!"); ErrorLog("Failed to load strings!");
return false; return false;
} }
LoadExpansionStrings();
env = device->getGUIEnvironment(); env = device->getGUIEnvironment();
numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16); numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
adFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 12); adFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 12);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment