Skip to content

Y
YGOMobile
Commit 7559c10c authored by fallenstardust's avatar fallenstardust
Browse files
Options

改变LoadExpansions执行顺位

parent 733356c3
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
Classes/gframe/game.cpp
View file @ 7559c10c
...@@ -215,7 +215,6 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -215,7 +215,6 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
imageManager.SetDevice(device); imageManager.SetDevice(device);
if(!imageManager.Initial(workingDir)) if(!imageManager.Initial(workingDir))
return false; return false;
LoadExpansions();
// LoadExpansions only load zips, the other cdb databases are still loaded by getDBFiles // LoadExpansions only load zips, the other cdb databases are still loaded by getDBFiles
io::path* cdbs = options->getDBFiles(); io::path* cdbs = options->getDBFiles();
len = options->getDbCount(); len = options->getDbCount();
...@@ -237,6 +236,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -237,6 +236,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
} }
if(!dataManager.LoadStrings((workingDir + path("/strings.conf")).c_str())) if(!dataManager.LoadStrings((workingDir + path("/strings.conf")).c_str()))
return false; return false;
LoadExpansions();
env = device->getGUIEnvironment(); env = device->getGUIEnvironment();
bool isAntialias = options->isFontAntiAliasEnabled(); bool isAntialias = options->isFontAntiAliasEnabled();
numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, (int)16 * yScale, isAntialias, false); numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, (int)16 * yScale, isAntialias, false);
......
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