merge

gframe/deck_manager.cpp

@@ -49,6 +49,11 @@ void DeckManager::LoadLFListSingle(const char* path) {
 		fclose(fp);
 	}
 }
+void DeckManager::LoadLFListDirectry(const char* path) {
+	char fpath[1000];
+	sprintf(fpath, "%s/lflist.conf", path);
+	LoadLFListSingle(fpath);
+}
 void DeckManager::LoadLFList() {
 	LoadLFListSingle("expansions/lflist.conf");
 #ifdef _WIN32
@@ -60,8 +65,8 @@ void DeckManager::LoadLFList() {
 			if(wcscmp(L".",fdataw.cFileName) != 0 && wcscmp(L"..",fdataw.cFileName) != 0 && fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
 				char fname[780];
 				BufferIO::EncodeUTF8(fdataw.cFileName, fname);
-				sprintf(fpath, "./expansions/%s/lflist.conf", fname);
-				LoadLFListSingle(fpath);
+				sprintf(fpath, "./expansions/%s", fname);
+				LoadLFListDirectry(fpath);
 			}
 		} while(FindNextFileW(fh, &fdataw));
 		FindClose(fh);
@@ -74,8 +79,8 @@ void DeckManager::LoadLFList() {
 			if (strcmp(".", dirp->d_name) == 0 || strcmp("..", dirp->d_name) == 0 || dirp->d_type != DT_DIR)
 				continue;
 			char filepath[1000];
-			sprintf(filepath, "./expansions/%s/lflist.conf", dirp->d_name);
-			LoadLFListSingle(filepath);
+			sprintf(filepath, "./expansions/%s", dirp->d_name);
+			LoadLFListDirectry(filepath);
 		}
 		closedir(dir);
 	}

gframe/deck_manager.h

@@ -36,6 +36,7 @@ public:
 	std::vector<LFList> _lfList;
 
 	void LoadLFListSingle(const char* path);
+	void LoadLFListDirectry(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

@@ -93,12 +93,12 @@ bool Game::Initialize() {
 		ErrorLog("Failed to load card database (cards.cdb)!");
 		return false;
 	}
+	LoadExpansionStrings();
 	if(dataManager.LoadStrings(GetLocaleDir("strings.conf"))) {} else
 	if(!dataManager.LoadStrings("strings.conf")) {
 		ErrorLog("Failed to load strings!");
 		return false;
 	}
-	LoadExpansionStrings();
 	env = device->getGUIEnvironment();
 	numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
 	adFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 12);