Commit d08852b5 authored by wind2009's avatar wind2009

Merge remote-tracking branch 'upstream/master' into develop

parents 9b4b1072 aa33999f
......@@ -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;
}
......
......@@ -660,7 +660,7 @@
!counter 0x68 指示物(图腾柱)
!counter 0x69 指示物(吠陀-优婆尼沙昙)
!counter 0x6a 响鸣指示物
!counter 0x6b 狂爱指示物
!counter 0x106b 狂爱指示物
!counter 0x6c 访问指示物
!counter 0x6d 祝台指示物
#setnames, using tab for comment
......@@ -1243,5 +1243,5 @@
!setname 0x1be 雷火沸动 ライゼオル
!setname 0x1bf 码丽丝 MLICE
!setname 0x1c0 龙华 竜華
!setname 0x1c1耳戈视☆将ARGS
!setname 0x1c1尔戈☆群ARGS
!setname 0x1c2 喷水引擎 アクア・ジェット
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