Skip to content

Y
ygopro
Commit 99cb5ed9 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'develop' into dl

parents dd89c332 cb1ef41e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
gframe/deck_manager.cpp
View file @ 99cb5ed9
...@@ -56,6 +56,7 @@ void DeckManager::LoadLFList() { ...@@ -56,6 +56,7 @@ void DeckManager::LoadLFList() {
#endif #endif
#endif #endif
LoadLFListSingle("expansions/lflist.conf"); LoadLFListSingle("expansions/lflist.conf");
LoadLFListSingle("specials/lflist.conf");
LoadLFListSingle("lflist.conf"); LoadLFListSingle("lflist.conf");
LFList nolimit; LFList nolimit;
nolimit.listName = L"N/A"; nolimit.listName = L"N/A";
......
gframe/game.cpp
View file @ 99cb5ed9
...@@ -194,6 +194,7 @@ bool Game::Initialize() { ...@@ -194,6 +194,7 @@ bool Game::Initialize() {
return false; return false;
} }
LoadExpansions(); LoadExpansions();
dataManager.LoadDB(L"specials/special.cdb");
env = device->getGUIEnvironment(); env = device->getGUIEnvironment();
numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16); numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
if(!numFont) { if(!numFont) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment