merge

dcd83cdb · nanahira · 2de526c4 · 9fd07978 · dcd83cdb
Commit dcd83cdb authored Nov 04, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gframe/game.cpp gframe/game.cpp +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -93,12 +93,12 @@ bool Game::Initialize() {
 		ErrorLog("Failed to load card database (cards.cdb)!");
 		return false;
 	}
-	LoadExpansionStrings();
 	if(dataManager.LoadStrings(GetLocaleDir("strings.conf"))) {} else
 	if(!dataManager.LoadStrings("strings.conf")) {
 		ErrorLog("Failed to load strings!");
 		return false;
 	}
+	LoadExpansionStrings();
 	env = device->getGUIEnvironment();
 	numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
 	adFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 12);