Merge branch 'subdir_ne'

gframe/deck_manager.cpp

@@ -58,7 +58,7 @@ void DeckManager::LoadLFListSingle(const char* path) {
 void DeckManager::LoadLFList() {
 	LoadLFListSingle("expansions/lflist.conf");
 	FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) {
-		if(isdir && strcmp(name, ".") && strcmp(name, "..")) {
+		if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
 			char fpath[1024];
 			sprintf(fpath, "./expansions/%s/lflist.conf", name);
 			LoadLFListSingle(fpath);

gframe/game.cpp

@@ -978,7 +978,7 @@ void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gu
 void Game::LoadExpansionDB() {
 	LoadExpansionDBDirectry("./expansions");
 	FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) {
-		if(isdir && strcmp(name, ".") && strcmp(name, "..")) {
+		if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
 			char subdir[1024];
 			sprintf(subdir, "./expansions/%s", name);
 			LoadExpansionDBDirectry(subdir);
@@ -997,7 +997,7 @@ void Game::LoadExpansionDBDirectry(const char* path) {
 void Game::LoadExpansionStrings() {
 	dataManager.LoadStrings("./expansions/strings.conf");
 	FileSystem::TraversalDir("./expansions", [](const char* name, bool isdir) {
-		if(isdir && strcmp(name, ".") && strcmp(name, "..")) {
+		if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
 			char fpath[1024];
 			sprintf(fpath, "./expansions/%s/strings.conf", name);
 			dataManager.LoadStrings(fpath);

gframe/image_manager.cpp

@@ -308,7 +308,7 @@ irr::video::ITexture* ImageManager::GetTextureExpansions(char* file, s32 width,
 		return img;
 	bool find = false;
 	FileSystem::TraversalDir("./expansions", [this, file, width, height, &img, &find](const char* name, bool isdir) {
-		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) {
+		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
 			char subdir[1024];
 			sprintf(subdir, "./expansions/%s", name);
 			img = GetTextureExpansionsDirectry(subdir, file, width, height);

gframe/replay_mode.cpp

@@ -951,7 +951,7 @@ byte* ReplayMode::ScriptReaderEx(const char* script_name, int* slen) {
 		return buffer;
 	bool find = false;
 	FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
-		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) {
+		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
 			char subdir[1024];
 			sprintf(subdir, "./expansions/%s", name);
 			buffer = ScriptReaderExDirectry(subdir, script_name, slen);

gframe/single_duel.cpp

@@ -1563,7 +1563,7 @@ byte* SingleDuel::ScriptReaderEx(const char* script_name, int* slen) {
 		return buffer;
 	bool find = false;
 	FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
-		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) {
+		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
 			char subdir[1024];
 			sprintf(subdir, "./expansions/%s", name);
 			buffer = ScriptReaderExDirectry(subdir, script_name, slen);

gframe/single_mode.cpp

@@ -869,7 +869,7 @@ byte* SingleMode::ScriptReaderEx(const char* script_name, int* slen) {
 		return buffer;
 	bool find = false;
 	FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
-		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) {
+		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
 			char subdir[1024];
 			sprintf(subdir, "./expansions/%s", name);
 			buffer = ScriptReaderExDirectry(subdir, script_name, slen);

gframe/tag_duel.cpp

@@ -1704,7 +1704,7 @@ byte* TagDuel::ScriptReaderEx(const char* script_name, int* slen) {
 		return buffer;
 	bool find = false;
 	FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
-		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) {
+		if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
 			char subdir[1024];
 			sprintf(subdir, "./expansions/%s", name);
 			buffer = ScriptReaderExDirectry(subdir, script_name, slen);