Merge branch 'develop' into server-develop

8075ab18 · nanahira · 9a2ba2e0 · a1bfb45a · 8075ab18
Commit 8075ab18 authored Jun 13, 2025 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

gframe/game.cpp gframe/game.cpp +9 -9

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -1325,16 +1325,16 @@ void Game::LoadExpansions() {
 			dataManager.LoadDB(fpath);
 			return;
 		}
+		if (IsExtension(name, L".conf")) {
+			if(!std::wcscmp(name, L"lflist.conf"))
+				deckManager.LoadLFListSingle(fpath, true);
+			else {
 #ifndef YGOPRO_SERVER_MODE
-		if (IsExtension(name, L".conf") && std::wcscmp(name, L"lflist.conf")) {
-			char upath[1024];
-			BufferIO::EncodeUTF8(fpath, upath);
-			dataManager.LoadStrings(upath);
-			return;
-		}
-#endif // YGOPRO_SERVER_MODE
-		if (!std::wcscmp(name, L"lflist.conf")) {
-			deckManager.LoadLFListSingle(fpath, true);
+				char upath[1024];
+				BufferIO::EncodeUTF8(fpath, upath);
+				dataManager.LoadStrings(upath);
+#endif
+			}
 			return;
 		}
 #if defined(SERVER_ZIP_SUPPORT) || !defined(YGOPRO_SERVER_MODE)