Merge branch 'resize' into test

gframe/config.h

@@ -66,6 +66,7 @@ inline int myswprintf(wchar_t(&buf)[N], const wchar_t* fmt, TR... args) {
 #include <memory.h>
 #include <time.h>
 #include "bufferio.h"
+#include "myfilesystem.h"
 #include "mymutex.h"
 #include "mysignal.h"
 #include "mythread.h"

gframe/deck_manager.cpp

@@ -8,47 +8,11 @@ namespace ygo {
 
 DeckManager deckManager;
 
-void DeckManager::LoadLFList() {
+void DeckManager::LoadLFListSingle(const char* path) {
 	LFList* cur = NULL;
-	FILE* fp = fopen("lflist.conf", "r");
-	FILE* fp_custom = fopen("expansions/lflist.conf", "r");
+	FILE* fp = fopen(path, "r");
 	char linebuf[256];
 	wchar_t strBuffer[256];
-	if(fp_custom) {
-		while(fgets(linebuf, 256, fp_custom)) {
-			if(linebuf[0] == '#')
-				continue;
-			int p = 0, sa = 0, code, count;
-			if(linebuf[0] == '!') {
-				sa = BufferIO::DecodeUTF8((const char*)(&linebuf[1]), strBuffer);
-				while(strBuffer[sa - 1] == L'\r' || strBuffer[sa - 1] == L'\n' ) sa--;
-				LFList newlist;
-				_lfList.push_back(newlist);
-				cur = &_lfList[_lfList.size() - 1];
-				memcpy(cur->listName, (const void*)strBuffer, 40);
-				cur->listName[sa] = 0;
-				cur->content = new std::unordered_map<int, int>;
-				cur->hash = 0x7dfcee6a;
-				continue;
-			}
-			while(linebuf[p] != ' ' && linebuf[p] != '\t' && linebuf[p] != 0) p++;
-			if(linebuf[p] == 0)
-				continue;
-			linebuf[p++] = 0;
-			sa = p;
-			code = atoi(linebuf);
-			if(code == 0)
-				continue;
-			while(linebuf[p] == ' ' || linebuf[p] == '\t') p++;
-			while(linebuf[p] != ' ' && linebuf[p] != '\t' && linebuf[p] != 0) p++;
-			linebuf[p] = 0;
-			count = atoi(&linebuf[sa]);
-			if(cur == NULL) continue;
-			(*cur->content)[code] = count;
-			cur->hash = cur->hash ^ ((code << 18) | (code >> 14)) ^ ((code << (27 + count)) | (code >> (5 - count)));
-		}
-		fclose(fp_custom);
-	}
 	if(fp) {
 		while(fgets(linebuf, 256, fp)) {
 			if(linebuf[0] == '#')
@@ -60,7 +24,7 @@ void DeckManager::LoadLFList() {
 				LFList newlist;
 				_lfList.push_back(newlist);
 				cur = &_lfList[_lfList.size() - 1];
-				memcpy(cur->listName, (const void*)strBuffer, 40);
+				memcpy(cur->listName, (const void*)strBuffer, 20 * sizeof(wchar_t));
 				cur->listName[sa] = 0;
 				cur->content = new std::unordered_map<int, int>;
 				cur->hash = 0x7dfcee6a;
@@ -84,6 +48,10 @@ void DeckManager::LoadLFList() {
 		}
 		fclose(fp);
 	}
+}
+void DeckManager::LoadLFList() {
+	LoadLFListSingle("expansions/lflist.conf");
+	LoadLFListSingle("lflist.conf");
 	LFList nolimit;
 	myswprintf(nolimit.listName, L"N/A");
 	nolimit.hash = 0;
@@ -266,6 +234,8 @@ bool DeckManager::LoadDeck(const wchar_t* file) {
 	return true;
 }
 bool DeckManager::SaveDeck(Deck& deck, const wchar_t* name) {
+	if(!FileSystem::IsDirExists(L"./deck") && !FileSystem::MakeDir(L"./deck"))
+		return false;
 	wchar_t file[64];
 	myswprintf(file, L"./deck/%ls.ydk", name);
 	FILE* fp = OpenDeckFile(file, "w");

gframe/deck_manager.h

@@ -35,6 +35,7 @@ public:
 	Deck current_deck;
 	std::vector<LFList> _lfList;
 
+	void LoadLFListSingle(const char* path);
 	void LoadLFList();
 	wchar_t* GetLFListName(int lfhash);
 	int CheckDeck(Deck& deck, int lfhash, bool allow_ocg, bool allow_tcg);

gframe/game.cpp

@@ -10,16 +10,6 @@
 #include "netserver.h"
 #include "single_mode.h"
 
-#ifndef _WIN32
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <unistd.h>
-#else
-#include <direct.h>
-#include <io.h>
-#endif
-
 const unsigned short PRO_VERSION = 0x1346;
 
 namespace ygo {
@@ -28,7 +18,6 @@ Game* mainGame;
 
 bool Game::Initialize() {
 	srand(time(0));
-	initUtils();
 	LoadConfig();
 	irr::SIrrlichtCreationParameters params = irr::SIrrlichtCreationParameters();
 	params.AntiAlias = gameConf.antialias;
@@ -38,8 +27,10 @@ bool Game::Initialize() {
 		params.DriverType = irr::video::EDT_OPENGL;
 	params.WindowSize = irr::core::dimension2d<u32>(gameConf.window_width, gameConf.window_height);
 	device = irr::createDeviceEx(params);
-	if(!device)
+	if(!device) {
+		ErrorLog("Failed to create Irrlicht Engine device!");
 		return false;
+	}
 	xScale = 1;
 	yScale = 1;
 	linePatternD3D = 0;
@@ -63,13 +54,19 @@ bool Game::Initialize() {
 	driver->setTextureCreationFlag(irr::video::ETCF_CREATE_MIP_MAPS, false);
 	driver->setTextureCreationFlag(irr::video::ETCF_OPTIMIZED_FOR_QUALITY, true);
 	imageManager.SetDevice(device);
-	if(!imageManager.Initial())
+	if(!imageManager.Initial()) {
+		ErrorLog("Failed to load textures!");
 		return false;
+	}
 	LoadExpansionDB();
-	if(!dataManager.LoadDB("cards.cdb"))
+	if(!dataManager.LoadDB("cards.cdb")) {
+		ErrorLog("Failed to load card database (cards.cdb)!");
 		return false;
-	if(!dataManager.LoadStrings("strings.conf"))
+	}
+	if(!dataManager.LoadStrings("strings.conf")) {
+		ErrorLog("Failed to load strings!");
 		return false;
+	}
 	dataManager.LoadStrings("./expansions/strings.conf");
 	env = device->getGUIEnvironment();
 	numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
@@ -77,8 +74,10 @@ bool Game::Initialize() {
 	lpcFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 48);
 	guiFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, gameConf.textfontsize);
 	textFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, gameConf.textfontsize);
-	if(!numFont || !textFont)
+	if(!numFont || !textFont) {
+		ErrorLog("Failed to load font(s)!");
 		return false;
+	}
 	smgr = device->getSceneManager();
 	device->setWindowCaption(L"YGOPro");
 	device->setResizable(true);
@@ -932,70 +931,25 @@ void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gu
 	pControl->setText(dataManager.strBuffer);
 }
 void Game::LoadExpansionDB() {
-#ifdef _WIN32
-	char fpath[1000];
-	WIN32_FIND_DATAW fdataw;
-	HANDLE fh = FindFirstFileW(L"./expansions/*.cdb", &fdataw);
-	if(fh != INVALID_HANDLE_VALUE) {
-		do {
-			if(!(fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
-				char fname[780];
-				BufferIO::EncodeUTF8(fdataw.cFileName, fname);
-				sprintf(fpath, "./expansions/%s", fname);
-				dataManager.LoadDB(fpath);
-			}
-		} while(FindNextFileW(fh, &fdataw));
-		FindClose(fh);
-	}
-#else
-	DIR * dir;
-	struct dirent * dirp;
-	if((dir = opendir("./expansions/")) != NULL) {
-		while((dirp = readdir(dir)) != NULL) {
-			size_t len = strlen(dirp->d_name);
-			if(len < 5 || strcasecmp(dirp->d_name + len - 4, ".cdb") != 0)
-				continue;
-			char filepath[1000];
-			sprintf(filepath, "./expansions/%s", dirp->d_name);
-			dataManager.LoadDB(filepath);
+	FileSystem::TraversalDir("./expansions", [](const char* name, bool isdir) {
+		if(!isdir && !mystrncasecmp(strrchr(name, '.'), ".cdb", 4)) {
+			char fpath[1024];
+			sprintf(fpath, "./expansions/%s", name);
+			dataManager.LoadDB(fpath);
 		}
-		closedir(dir);
-	}
-#endif
+	});
 }
 void Game::RefreshDeck(irr::gui::IGUIComboBox* cbDeck) {
 	cbDeck->clear();
-#ifdef _WIN32
-	WIN32_FIND_DATAW fdataw;
-	HANDLE fh = FindFirstFileW(L"./deck/*.ydk", &fdataw);
-	if(fh == INVALID_HANDLE_VALUE)
-		return;
-	do {
-		if(!(fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
-			wchar_t* pf = fdataw.cFileName;
-			while(*pf) pf++;
-			while(*pf != L'.') pf--;
-			*pf = 0;
-			cbDeck->addItem(fdataw.cFileName);
+	FileSystem::TraversalDir(L"./deck", [cbDeck](const wchar_t* name, bool isdir) {
+		if(!isdir && !mywcsncasecmp(wcsrchr(name, '.'), L".ydk", 4)) {
+			size_t len = wcslen(name);
+			wchar_t deckname[256];
+			wcsncpy(deckname, name, len - 4);
+			deckname[len - 4] = 0;
+			cbDeck->addItem(deckname);
 		}
-	} while(FindNextFileW(fh, &fdataw));
-	FindClose(fh);
-#else
-	DIR * dir;
-	struct dirent * dirp;
-	if((dir = opendir("./deck/")) == NULL)
-		return;
-	while((dirp = readdir(dir)) != NULL) {
-		size_t len = strlen(dirp->d_name);
-		if(len < 5 || strcasecmp(dirp->d_name + len - 4, ".ydk") != 0)
-			continue;
-		dirp->d_name[len - 4] = 0;
-		wchar_t wname[256];
-		BufferIO::DecodeUTF8(dirp->d_name, wname);
-		cbDeck->addItem(wname);
-	}
-	closedir(dir);
-#endif
+	});
 	for(size_t i = 0; i < cbDeck->getItemCount(); ++i) {
 		if(!wcscmp(cbDeck->getItem(i), gameConf.lastdeck)) {
 			cbDeck->setSelected(i);
@@ -1005,61 +959,17 @@ void Game::RefreshDeck(irr::gui::IGUIComboBox* cbDeck) {
 }
 void Game::RefreshReplay() {
 	lstReplayList->clear();
-#ifdef _WIN32
-	WIN32_FIND_DATAW fdataw;
-	HANDLE fh = FindFirstFileW(L"./replay/*.yrp", &fdataw);
-	if(fh == INVALID_HANDLE_VALUE)
-		return;
-	do {
-		if(!(fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && Replay::CheckReplay(fdataw.cFileName)) {
-			lstReplayList->addItem(fdataw.cFileName);
-		}
-	} while(FindNextFileW(fh, &fdataw));
-	FindClose(fh);
-#else
-	DIR * dir;
-	struct dirent * dirp;
-	if((dir = opendir("./replay/")) == NULL)
-		return;
-	while((dirp = readdir(dir)) != NULL) {
-		size_t len = strlen(dirp->d_name);
-		if(len < 5 || strcasecmp(dirp->d_name + len - 4, ".yrp") != 0)
-			continue;
-		wchar_t wname[256];
-		BufferIO::DecodeUTF8(dirp->d_name, wname);
-		if(Replay::CheckReplay(wname))
-			lstReplayList->addItem(wname);
-	}
-	closedir(dir);
-#endif
+	FileSystem::TraversalDir(L"./replay", [this](const wchar_t* name, bool isdir) {
+		if(!isdir && !mywcsncasecmp(wcsrchr(name, '.'), L".yrp", 4) && Replay::CheckReplay(name))
+			lstReplayList->addItem(name);
+	});
 }
 void Game::RefreshSingleplay() {
 	lstSinglePlayList->clear();
-#ifdef _WIN32
-	WIN32_FIND_DATAW fdataw;
-	HANDLE fh = FindFirstFileW(L"./single/*.lua", &fdataw);
-	if(fh == INVALID_HANDLE_VALUE)
-		return;
-	do {
-		if(!(fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
-			lstSinglePlayList->addItem(fdataw.cFileName);
-	} while(FindNextFileW(fh, &fdataw));
-	FindClose(fh);
-#else
-	DIR * dir;
-	struct dirent * dirp;
-	if((dir = opendir("./single/")) == NULL)
-		return;
-	while((dirp = readdir(dir)) != NULL) {
-		size_t len = strlen(dirp->d_name);
-		if(len < 5 || strcasecmp(dirp->d_name + len - 4, ".lua") != 0)
-			continue;
-		wchar_t wname[256];
-		BufferIO::DecodeUTF8(dirp->d_name, wname);
-		lstSinglePlayList->addItem(wname);
-	}
-	closedir(dir);
-#endif
+	FileSystem::TraversalDir(L"./single", [this](const wchar_t* name, bool isdir) {
+		if(!isdir && !mywcsncasecmp(wcsrchr(name, '.'), L".lua", 4))
+			lstSinglePlayList->addItem(name);
+	});
 }
 void Game::RefreshBot() {
 	if(!gameConf.enable_bot_mode)
@@ -1415,7 +1325,7 @@ void Game::ClearCardInfo(int player) {
 	stText->setText(L"");
 	scrCardText->setVisible(false);
 }
-void Game::AddChatMsg(wchar_t* msg, int player) {
+void Game::AddChatMsg(const wchar_t* msg, int player) {
 	for(int i = 7; i > 0; --i) {
 		chatMsg[i] = chatMsg[i - 1];
 		chatTiming[i] = chatTiming[i - 1];
@@ -1466,72 +1376,28 @@ void Game::ClearChatMsg() {
 		chatTiming[i] = 0;
 	}
 }
-void Game::AddDebugMsg(char* msg)
-{
+void Game::AddDebugMsg(const char* msg) {
 	if (enable_log & 0x1) {
 		wchar_t wbuf[1024];
 		BufferIO::DecodeUTF8(msg, wbuf);
 		AddChatMsg(wbuf, 9);
 	}
 	if (enable_log & 0x2) {
-		FILE* fp = fopen("error.log", "at");
-		if (!fp)
-			return;
-		time_t nowtime = time(NULL);
-		struct tm *localedtime = localtime(&nowtime);
-		char timebuf[40];
-		strftime(timebuf, 40, "%Y-%m-%d %H:%M:%S", localedtime);
-		fprintf(fp, "[%s][Script Error]: %s\n", timebuf, msg);
-		fclose(fp);
+		char msgbuf[1040];
+		sprintf(msgbuf, "[Script Error]: %s", msg);
+		ErrorLog(msgbuf);
 	}
 }
-bool Game::MakeDirectory(const std::string folder) {
-    std::string folder_builder;
-    std::string sub;
-    sub.reserve(folder.size());
-    for(auto it = folder.begin(); it != folder.end(); ++it) {
-        const char c = *it;
-        sub.push_back(c);
-        if(c == '/' || it == folder.end() - 1) {
-            folder_builder.append(sub);
-            if(access(folder_builder.c_str(), 0) != 0)
-#ifdef _WIN32
-                if(mkdir(folder_builder.c_str()) != 0)
-#else
-                if(mkdir(folder_builder.c_str(), 0777) != 0)
-#endif
-                    return false;
-            sub.clear();
-        }
-    }
-    return true;
-}
-void Game::initUtils() {
-	//user files
-	MakeDirectory("replay");
-	//cards from extra pack
-	MakeDirectory("expansions");
-	//files in ygopro-starter-pack
-	MakeDirectory("deck");
-	MakeDirectory("single");
-	//original files
-	MakeDirectory("script");
-	MakeDirectory("textures");
-	//sound
-#ifdef YGOPRO_USE_IRRKLANG
-	MakeDirectory("sound");
-	MakeDirectory("sound/BGM");
-	MakeDirectory("sound/BGM/advantage");
-	MakeDirectory("sound/BGM/deck");
-	MakeDirectory("sound/BGM/disadvantage");
-	MakeDirectory("sound/BGM/duel");
-	MakeDirectory("sound/BGM/lose");
-	MakeDirectory("sound/BGM/menu");
-	MakeDirectory("sound/BGM/win");
-#endif
-	//pics
-	MakeDirectory("pics");
-	MakeDirectory("pics/field");
+void Game::ErrorLog(const char* msg) {
+	FILE* fp = fopen("error.log", "at");
+	if(!fp)
+		return;
+	time_t nowtime = time(NULL);
+	struct tm *localedtime = localtime(&nowtime);
+	char timebuf[40];
+	strftime(timebuf, 40, "%Y-%m-%d %H:%M:%S", localedtime);
+	fprintf(fp, "[%s]%s\n", timebuf, msg);
+	fclose(fp);
 }
 void Game::ClearTextures() {
 	matManager.mCard.setTexture(0, 0);

gframe/game.h

@@ -139,11 +139,10 @@ public:
 	void SaveConfig();
 	void ShowCardInfo(int code, bool resize = false);
 	void ClearCardInfo(int player = 0);
-	void AddChatMsg(wchar_t* msg, int player);
+	void AddChatMsg(const wchar_t* msg, int player);
 	void ClearChatMsg();
-	void AddDebugMsg(char* msgbuf);
-	bool MakeDirectory(const std::string folder);
-	void initUtils();
+	void AddDebugMsg(const char* msgbuf);
+	void ErrorLog(const char* msgbuf);
 	void ClearTextures();
 	void CloseDuelWindow();
 

gframe/myfilesystem.h

+#ifndef FILESYSTEM_H
+#define FILESYSTEM_H
+
+#include <string.h>
+#include <functional>
+#include "bufferio.h"
+
+#ifdef _WIN32
+#include <direct.h>
+#include <sys/stat.h>
+#else
+#include <dirent.h>
+#include <sys/stat.h>
+#endif
+
+#ifdef _WIN32
+
+#include <Windows.h>
+
+class FileSystem {
+public:
+	static bool IsFileExists(const wchar_t* wfile) {
+		struct _stat fileStat;
+		return (_wstat(wfile, &fileStat) == 0) && !(fileStat.st_mode & _S_IFDIR);
+	}
+
+	static bool IsFileExists(const char* file) {
+		wchar_t wfile[1024];
+		BufferIO::DecodeUTF8(file, wfile);
+		return IsFileExists(wfile);
+	}
+
+	static bool IsDirExists(const wchar_t* wdir) {
+		struct _stat fileStat;
+		return (_wstat(wdir, &fileStat) == 0) && (fileStat.st_mode & _S_IFDIR);
+	}
+
+	static bool IsDirExists(const char* dir) {
+		wchar_t wdir[1024];
+		BufferIO::DecodeUTF8(dir, wdir);
+		return IsDirExists(wdir);
+	}
+
+	static bool MakeDir(const wchar_t* wdir) {
+		return _wmkdir(wdir) == 0;
+	}
+
+	static bool MakeDir(const char* dir) {
+		wchar_t wdir[1024];
+		BufferIO::DecodeUTF8(dir, wdir);
+		return MakeDir(wdir);
+	}
+
+	static void TraversalDir(const wchar_t* wpath, const std::function<void(const wchar_t*, bool)>& cb) {
+		wchar_t findstr[1024];
+		wcscpy(findstr, wpath);
+		wcscat(findstr, L"/*");
+		WIN32_FIND_DATAW fdataw;
+		HANDLE fh = FindFirstFileW(findstr, &fdataw);
+		if(fh == INVALID_HANDLE_VALUE)
+			return;
+		do {
+			cb(fdataw.cFileName, (fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY));
+		} while(FindNextFileW(fh, &fdataw));
+		FindClose(fh);
+	}
+
+	static void TraversalDir(const char* path, const std::function<void(const char*, bool)>& cb) {
+		wchar_t wpath[1024];
+		BufferIO::DecodeUTF8(path, wpath);
+		TraversalDir(wpath, [&cb](const wchar_t* wname, bool isdir) {
+			char name[1024];
+			BufferIO::EncodeUTF8(wname, name);
+			cb(name, isdir);
+		});
+	}
+};
+
+#else
+
+class FileSystem {
+public:
+	static bool IsFileExists(const char* file) {
+		struct stat fileStat;
+		return (stat(file, &fileStat) == 0) && !S_ISDIR(fileStat.st_mode);
+	}
+
+	static bool IsFileExists(const wchar_t* wfile) {
+		char file[1024];
+		BufferIO::EncodeUTF8(wfile, file);
+		return IsFileExists(file);
+	}
+
+	static bool IsDirExists(const char* dir) {
+		struct stat fileStat;
+		return (stat(dir, &fileStat) == 0) && S_ISDIR(fileStat.st_mode);
+	}
+
+	static bool IsDirExists(const wchar_t* wdir) {
+		char dir[1024];
+		BufferIO::EncodeUTF8(wdir, dir);
+		return IsDirExists(dir);
+	}
+
+	static bool MakeDir(const char* dir) {
+		return mkdir(dir, 0775) == 0;
+	}
+
+	static bool MakeDir(const wchar_t* wdir) {
+		char dir[1024];
+		BufferIO::EncodeUTF8(wdir, dir);
+		return MakeDir(dir);
+	}
+
+	static void TraversalDir(const char* path, const std::function<void(const char*, bool)>& cb) {
+		DIR* dir = nullptr;
+		struct dirent* dirp = nullptr;
+		if((dir = opendir(path)) == nullptr)
+			return;
+		struct stat fileStat;
+		while((dirp = readdir(dir)) != nullptr) {
+			char fname[1024];
+			strcpy(fname, path);
+			strcat(fname, "/");
+			strcat(fname, dirp->d_name);
+			stat(fname, &fileStat);
+			cb(dirp->d_name, S_ISDIR(fileStat.st_mode));
+		}
+		closedir(dir);
+	}
+
+	static void TraversalDir(const wchar_t* wpath, const std::function<void(const wchar_t*, bool)>& cb) {
+		char path[1024];
+		BufferIO::EncodeUTF8(wpath, path);
+		TraversalDir(path, [&cb](const char* name, bool isdir) {
+			wchar_t wname[1024];
+			BufferIO::DecodeUTF8(name, wname);
+			cb(wname, isdir);
+		});
+	}
+};
+
+#endif // _WIN32
+
+#endif //FILESYSTEM_H

gframe/replay.cpp

@@ -17,6 +17,8 @@ Replay::~Replay() {
 	delete[] comp_data;
 }
 void Replay::BeginRecord() {
+	if(!FileSystem::IsDirExists(L"./replay") && !FileSystem::MakeDir(L"./replay"))
+		return;
 #ifdef _WIN32
 	if(is_recording)
 		CloseHandle(recording_fp);
@@ -123,6 +125,8 @@ void Replay::EndRecord() {
 	is_recording = false;
 }
 void Replay::SaveReplay(const wchar_t* name) {
+	if(!FileSystem::IsDirExists(L"./replay") && !FileSystem::MakeDir(L"./replay"))
+		return;
 	wchar_t fname[256];
 	myswprintf(fname, L"./replay/%ls.yrp", name);
 #ifdef WIN32

gframe/sound_manager.cpp

 #include "sound_manager.h"
-#ifndef _WIN32
-#include <dirent.h>
-#endif
 #ifdef IRRKLANG_STATIC
 #include "../ikpmp3/ikpMP3.h"
 #endif
@@ -30,51 +27,23 @@ bool SoundManager::Init() {
 }
 void SoundManager::RefreshBGMList() {
 	RefershBGMDir(L"", BGM_DUEL);
-	RefershBGMDir(L"duel/", BGM_DUEL);
-	RefershBGMDir(L"menu/", BGM_MENU);
-	RefershBGMDir(L"deck/", BGM_DECK);
-	RefershBGMDir(L"advantage/", BGM_ADVANTAGE);
-	RefershBGMDir(L"disadvantage/", BGM_DISADVANTAGE);
-	RefershBGMDir(L"win/", BGM_WIN);
-	RefershBGMDir(L"lose/", BGM_LOSE);
+	RefershBGMDir(L"duel", BGM_DUEL);
+	RefershBGMDir(L"menu", BGM_MENU);
+	RefershBGMDir(L"deck", BGM_DECK);
+	RefershBGMDir(L"advantage", BGM_ADVANTAGE);
+	RefershBGMDir(L"disadvantage", BGM_DISADVANTAGE);
+	RefershBGMDir(L"win", BGM_WIN);
+	RefershBGMDir(L"lose", BGM_LOSE);
 }
 void SoundManager::RefershBGMDir(std::wstring path, int scene) {
-#ifdef _WIN32
-	WIN32_FIND_DATAW fdataw;
-	std::wstring search = L"./sound/BGM/" + path + L"*.*";
-	HANDLE fh = FindFirstFileW(search.c_str(), &fdataw);
-	if(fh == INVALID_HANDLE_VALUE)
-		return;
-	do {
-		size_t len = wcslen(fdataw.cFileName);
-		if((fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || len < 5
-			|| !(_wcsicmp(fdataw.cFileName + len - 4, L".mp3") == 0 || _wcsicmp(fdataw.cFileName + len - 4, L".ogg") == 0))
-			continue;
-		std::wstring filename = path + (std::wstring)fdataw.cFileName;
-		BGMList[BGM_ALL].push_back(filename);
-		BGMList[scene].push_back(filename);
-	} while(FindNextFileW(fh, &fdataw));
-	FindClose(fh);
-#else
-	DIR * dir;
-	struct dirent * dirp;
-	std::wstring wsearchpath = L"./sound/BGM/" + path;
-	char searchpath[256];
-	BufferIO::EncodeUTF8(wsearchpath.c_str(), searchpath);
-	if((dir = opendir(searchpath)) == NULL)
-		return;
-	while((dirp = readdir(dir)) != NULL) {
-		size_t len = strlen(dirp->d_name);
-		if(len < 5 || !(strcasecmp(dirp->d_name + len - 4, ".mp3") == 0 || strcasecmp(dirp->d_name + len - 4, ".ogg")))
-			continue;
-		wchar_t wname[256];
-		BufferIO::DecodeUTF8(dirp->d_name, wname);
-		std::wstring filename = path + (std::wstring)wname;
-		BGMList[BGM_ALL].push_back(filename);
-		BGMList[scene].push_back(filename);
-	}
-	closedir(dir);
-#endif
+	std::wstring search = L"./sound/BGM/" + path;
+	FileSystem::TraversalDir(search.c_str(), [this, &path, scene](const wchar_t* name, bool isdir) {
+		if(!isdir && (!mywcsncasecmp(wcsrchr(name, '.'), L".mp3", 4) || !mywcsncasecmp(wcsrchr(name, '.'), L".ogg", 4))) {
+			std::wstring filename = path + L"/" + name;
+			BGMList[BGM_ALL].push_back(filename);
+			BGMList[scene].push_back(filename);
+		}
+	});
 }
 void SoundManager::PlaySoundEffect(int sound) {
 #ifdef YGOPRO_USE_IRRKLANG