fix

gframe/replay_mode.cpp

@@ -947,7 +947,9 @@ byte* ReplayMode::::ScriptReaderEx(const char* script_name, int* slen) {
 				char fname[780];
 				BufferIO::EncodeUTF8(fdataw.cFileName, fname);
 				sprintf(fpath, "./expansions/%s", fname);
-				return ScriptReaderExDirectry(fpath, script_name, slen)
+				byte* buffer = ScriptReaderExDirectry(fpath, script_name, slen)
+				if(buffer)
+					return buffer;
 			}
 		} while(FindNextFileW(fh, &fdataw));
 		FindClose(fh);
@@ -961,7 +963,9 @@ byte* ReplayMode::::ScriptReaderEx(const char* script_name, int* slen) {
 				continue;
 			char filepath[1000];
 			sprintf(filepath, "./expansions/%s/", dirp->d_name);
-			return ScriptReaderExDirectry(filepath, script_name, slen)
+			byte* buffer = ScriptReaderExDirectry(filepath, script_name, slen)
+			if(buffer)
+				return buffer;
 		}
 		closedir(dir);
 	}
@@ -971,11 +975,7 @@ byte* ReplayMode::::ScriptReaderEx(const char* script_name, int* slen) {
 byte* ReplayMode::ScriptReaderExDirectry(const char* path, const char* script_name, int* slen) {
 	char sname[256] = path;
 	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
-	byte* buffer = default_script_reader(sname, slen);
-	if(buffer)
-		return buffer;
-	else
-		return default_script_reader(script_name, slen);
+	return default_script_reader(sname, slen);
 }
 int ReplayMode::MessageHandler(long fduel, int type) {
 	if(!enable_log)

gframe/single_duel.cpp

@@ -1557,7 +1557,9 @@ byte* SingleDuel::::ScriptReaderEx(const char* script_name, int* slen) {
 				char fname[780];
 				BufferIO::EncodeUTF8(fdataw.cFileName, fname);
 				sprintf(fpath, "./expansions/%s", fname);
-				return ScriptReaderExDirectry(fpath, script_name, slen)
+				byte* buffer = ScriptReaderExDirectry(fpath, script_name, slen)
+				if(buffer)
+					return buffer;
 			}
 		} while(FindNextFileW(fh, &fdataw));
 		FindClose(fh);
@@ -1571,7 +1573,9 @@ byte* SingleDuel::::ScriptReaderEx(const char* script_name, int* slen) {
 				continue;
 			char filepath[1000];
 			sprintf(filepath, "./expansions/%s/", dirp->d_name);
-			return ScriptReaderExDirectry(filepath, script_name, slen)
+			byte* buffer = ScriptReaderExDirectry(filepath, script_name, slen)
+			if(buffer)
+				return buffer;
 		}
 		closedir(dir);
 	}
@@ -1581,11 +1585,7 @@ byte* SingleDuel::::ScriptReaderEx(const char* script_name, int* slen) {
 byte* SingleDuel::ScriptReaderExDirectry(const char* path, const char* script_name, int* slen) {
 	char sname[256] = path;
 	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
-	byte* buffer = default_script_reader(sname, slen);
-	if(buffer)
-		return buffer;
-	else
-		return default_script_reader(script_name, slen);
+	return default_script_reader(sname, slen);
 }
 int SingleDuel::MessageHandler(long fduel, int type) {
 	if(!enable_log)

gframe/single_mode.cpp

@@ -857,7 +857,9 @@ byte* SingleMode::::ScriptReaderEx(const char* script_name, int* slen) {
 				char fname[780];
 				BufferIO::EncodeUTF8(fdataw.cFileName, fname);
 				sprintf(fpath, "./expansions/%s", fname);
-				return ScriptReaderExDirectry(fpath, script_name, slen)
+				byte* buffer = ScriptReaderExDirectry(fpath, script_name, slen)
+				if(buffer)
+					return buffer;
 			}
 		} while(FindNextFileW(fh, &fdataw));
 		FindClose(fh);
@@ -871,7 +873,9 @@ byte* SingleMode::::ScriptReaderEx(const char* script_name, int* slen) {
 				continue;
 			char filepath[1000];
 			sprintf(filepath, "./expansions/%s/", dirp->d_name);
-			return ScriptReaderExDirectry(filepath, script_name, slen)
+			byte* buffer = ScriptReaderExDirectry(filepath, script_name, slen)
+			if(buffer)
+				return buffer;
 		}
 		closedir(dir);
 	}
@@ -881,10 +885,7 @@ byte* SingleMode::::ScriptReaderEx(const char* script_name, int* slen) {
 byte* SingleMode::ScriptReaderExDirectry(const char* path, const char* script_name, int* slen) {
 	char sname[256] = path;
 	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
-	if(ScriptReader(sname, slen))
-		return buffer;
-	else
-		return ScriptReader(script_name, slen);
+	return ScriptReader(sname, slen)
 }
 byte* SingleMode::ScriptReader(const char* script_name, int* slen) {
 	FILE *fp;

gframe/tag_duel.cpp

@@ -1675,7 +1675,9 @@ byte* TagDuel::::ScriptReaderEx(const char* script_name, int* slen) {
 				char fname[780];
 				BufferIO::EncodeUTF8(fdataw.cFileName, fname);
 				sprintf(fpath, "./expansions/%s", fname);
-				return ScriptReaderExDirectry(fpath, script_name, slen)
+				byte* buffer = ScriptReaderExDirectry(fpath, script_name, slen)
+				if(buffer)
+					return buffer;
 			}
 		} while(FindNextFileW(fh, &fdataw));
 		FindClose(fh);
@@ -1689,7 +1691,9 @@ byte* TagDuel::::ScriptReaderEx(const char* script_name, int* slen) {
 				continue;
 			char filepath[1000];
 			sprintf(filepath, "./expansions/%s/", dirp->d_name);
-			return ScriptReaderExDirectry(filepath, script_name, slen)
+			byte* buffer = ScriptReaderExDirectry(filepath, script_name, slen)
+			if(buffer)
+				return buffer;
 		}
 		closedir(dir);
 	}
@@ -1699,11 +1703,7 @@ byte* TagDuel::::ScriptReaderEx(const char* script_name, int* slen) {
 byte* TagDuel::ScriptReaderExDirectry(const char* path, const char* script_name, int* slen) {
 	char sname[256] = path;
 	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
-	byte* buffer = default_script_reader(sname, slen);
-	if(buffer)
-		return buffer;
-	else
-		return default_script_reader(script_name, slen);
+	return default_script_reader(sname, slen);
 }
 int TagDuel::MessageHandler(long fduel, int type) {
 	if(!enable_log)