Commit a29eeaba authored by Chen Bill's avatar Chen Bill Committed by GitHub

update expansions priority (#2638)

parent fe53acb7
......@@ -398,19 +398,19 @@ unsigned char* DataManager::ScriptReaderEx(const char* script_name, int* slen) {
char expansions_path[1024]{};
std::snprintf(expansions_path, sizeof expansions_path, "./expansions/%s", script_name + 2);
if(mainGame->gameConf.prefer_expansion_script) {
if (ScriptReader(script_name, slen))
if (DefaultScriptReader(expansions_path, slen))
return scriptBuffer;
else if (DefaultScriptReader(expansions_path, slen))
else if (ScriptReader(script_name, slen))
return scriptBuffer;
else if (DefaultScriptReader(script_name, slen))
return scriptBuffer;
} else {
if (DefaultScriptReader(script_name, slen))
return scriptBuffer;
else if (ScriptReader(script_name, slen))
return scriptBuffer;
else if (DefaultScriptReader(expansions_path, slen))
return scriptBuffer;
else if (ScriptReader(script_name, slen))
return scriptBuffer;
}
return nullptr;
}
......
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