merge

gframe/deck_manager.cpp

@@ -3,6 +3,9 @@
 #include "network.h"
 #include "game.h"
 #include <algorithm>
+#ifndef _WIN32
+#include <dirent.h>
+#endif
 
 namespace ygo {
 

gframe/replay_mode.cpp

@@ -940,8 +940,7 @@ void ReplayMode::ReplayReload() {
 	mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(1), LOCATION_REMOVED, (char*)queryBuffer);
 }
 byte* ReplayMode::ScriptReaderEx(const char* script_name, int* slen) {
-	byte* buffer;
-	buffer = ScriptReaderExDirectry("./specials", script_name, slen, 8);
+	byte* buffer = ScriptReaderExDirectry("./specials", script_name, slen, 8);
 	if(buffer)
 		return buffer;
 	buffer = ScriptReaderExDirectry("./expansions", script_name, slen);
@@ -976,7 +975,7 @@ byte* ReplayMode::ScriptReaderEx(const char* script_name, int* slen) {
 				continue;
 			char filepath[1000];
 			sprintf(filepath, "./expansions/%s/", dirp->d_name);
-			buffer = ScriptReaderExDirectry(fpath, script_name, slen);
+			buffer = ScriptReaderExDirectry(filepath, script_name, slen);
 			if(buffer)
 				return buffer;
 		}

gframe/single_duel.cpp

@@ -4,6 +4,9 @@
 #include "../ocgcore/ocgapi.h"
 #include "../ocgcore/common.h"
 #include "../ocgcore/mtrandom.h"
+#ifndef _WIN32
+#include <dirent.h>
+#endif
 
 namespace ygo {
 
@@ -1553,8 +1556,7 @@ void SingleDuel::RefreshSingle(int player, int location, int sequence, int flag)
 	}
 }
 byte* SingleDuel::ScriptReaderEx(const char* script_name, int* slen) {
-	byte* buffer;
-	buffer = ScriptReaderExDirectry("./specials", script_name, slen, 8);
+	byte* buffer = ScriptReaderExDirectry("./specials", script_name, slen, 8);
 	if(buffer)
 		return buffer;
 	buffer = ScriptReaderExDirectry("./expansions", script_name, slen);

gframe/single_mode.cpp

@@ -861,8 +861,7 @@ void SingleMode::SinglePlayReload() {
 	mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(1), LOCATION_REMOVED, (char*)queryBuffer);
 }
 byte* SingleMode::ScriptReaderEx(const char* script_name, int* slen) {
-	byte* buffer;
-	buffer = ScriptReaderExDirectry("./specials", script_name, slen, 8);
+	byte* buffer = ScriptReaderExDirectry("./specials", script_name, slen, 8);
 	if(buffer)
 		return buffer;
 	buffer = ScriptReaderExDirectry("./expansions", script_name, slen);
@@ -897,7 +896,7 @@ byte* SingleMode::ScriptReaderEx(const char* script_name, int* slen) {
 				continue;
 			char filepath[1000];
 			sprintf(filepath, "./expansions/%s/", dirp->d_name);
-			buffer = ScriptReaderExDirectry(fpath, script_name, slen);
+			buffer = ScriptReaderExDirectry(filepath, script_name, slen);
 			if(buffer)
 				return buffer;
 		}

gframe/tag_duel.cpp

@@ -4,6 +4,9 @@
 #include "../ocgcore/ocgapi.h"
 #include "../ocgcore/common.h"
 #include "../ocgcore/mtrandom.h"
+#ifndef _WIN32
+#include <dirent.h>
+#endif
 
 namespace ygo {
 
@@ -1694,8 +1697,7 @@ void TagDuel::RefreshSingle(int player, int location, int sequence, int flag) {
 }
 
 byte* TagDuel::ScriptReaderEx(const char* script_name, int* slen) {
-	byte* buffer;
-	buffer = ScriptReaderExDirectry("./specials", script_name, slen, 8);
+	byte* buffer = ScriptReaderExDirectry("./specials", script_name, slen, 8);
 	if(buffer)
 		return buffer;
 	buffer = ScriptReaderExDirectry("./expansions", script_name, slen);