Merge branch 'develop' into server-develop

6f28e7b0 · nanahira · 7da877f6 · cb1ef41e · 6f28e7b0 · 6f28e7b0
Commit 6f28e7b0 authored Apr 13, 2025 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

gframe/deck_manager.cpp gframe/deck_manager.cpp +1 -0

gframe/game.cpp gframe/game.cpp +1 -0

No files found.
--- a/gframe/deck_manager.cpp
+++ b/gframe/deck_manager.cpp
@@ -56,6 +56,7 @@ void DeckManager::LoadLFList() {
 #endif
 #endif
 	LoadLFListSingle("expansions/lflist.conf");
+	LoadLFListSingle("specials/lflist.conf");
 	LoadLFListSingle("lflist.conf");
 	LFList nolimit;
 	nolimit.listName = L"N/A";

--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -194,6 +194,7 @@ bool Game::Initialize() {
 		return false;
 	}
 	LoadExpansions();
+	dataManager.LoadDB(L"specials/special.cdb");
 	env = device->getGUIEnvironment();
 	numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
 	if(!numFont) {