Commit 745f7149 authored by nanahira's avatar nanahira

fix zip script

parent f1653bb2
......@@ -348,20 +348,17 @@ int DataManager::CardReader(int code, void* pData) {
byte* DataManager::ScriptReaderEx(const char* script_name, int* slen) {
byte* buffer;
if(!mainGame->gameConf.prefer_expansion_script) {
buffer = ScriptReaderExSingle(".", script_name, slen);
buffer = ScriptReaderExSingle("", script_name, slen);
if(buffer)
return buffer;
}
buffer = ScriptReaderExSingle("./specials", script_name, slen, 8);
buffer = ScriptReaderExSingle("specials/", script_name, slen, 9);
if(buffer)
return buffer;
buffer = ScriptReaderExSingle("./expansions", script_name, slen);
buffer = ScriptReaderExSingle("expansions/", script_name, slen);
if(buffer)
return buffer;
buffer = ScriptReaderExSingle("./beta", script_name, slen);
if(buffer)
return buffer;
return ScriptReader(script_name, slen);
return ScriptReaderExSingle("", script_name, slen);
}
byte* DataManager::ScriptReaderExSingle(const char* path, const char* script_name, int* slen, int pre_len) {
char sname[256];
......
......@@ -56,7 +56,7 @@ public:
static const wchar_t* unknown_string;
static int CardReader(int, void*);
static byte* ScriptReaderEx(const char* script_name, int* slen);
static byte* ScriptReaderExSingle(const char* path, const char* script_name, int* slen, int pre_len = 1);
static byte* ScriptReaderExSingle(const char* path, const char* script_name, int* slen, int pre_len = 2);
static byte* ScriptReader(const char* script_name, int* slen);
static IFileSystem* FileSystem;
};
......
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