Merge branch 'master' into server

gframe/data_manager.cpp

@@ -393,21 +393,18 @@ byte* DataManager::ScriptReaderEx(const char* script_name, int* slen) {
 	byte* buffer;
 #ifndef YGOPRO_SERVER_MODE
 	if(!mainGame->gameConf.prefer_expansion_script) {
-		buffer = ScriptReaderExSingle(".", script_name, slen);
+		buffer = ScriptReaderExSingle("", script_name, slen);
 		if(buffer)
 			return buffer;
 	}
 #endif
-	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];

gframe/data_manager.h

@@ -63,7 +63,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);
 #ifndef YGOPRO_SERVER_MODE
 	static IFileSystem* FileSystem;