Skip to content

Y
ygopro
Commit 8075ab18 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'develop' into server-develop

parents 9a2ba2e0 a1bfb45a
Pipeline #37526 passed with stages
        in 10 minutes and 12 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 9 additions and 9 deletions
        gframe/game.cpp
        View file @ 8075ab18
        ...@@ -1325,16 +1325,16 @@ void Game::LoadExpansions() { ...@@ -1325,16 +1325,16 @@ void Game::LoadExpansions() {
        dataManager.LoadDB(fpath); dataManager.LoadDB(fpath);
        return; return;
        } }
        if (IsExtension(name, L".conf")) {
        if(!std::wcscmp(name, L"lflist.conf"))
        deckManager.LoadLFListSingle(fpath, true);
        else {
        #ifndef YGOPRO_SERVER_MODE #ifndef YGOPRO_SERVER_MODE
        if (IsExtension(name, L".conf") && std::wcscmp(name, L"lflist.conf")) { char upath[1024];
        char upath[1024]; BufferIO::EncodeUTF8(fpath, upath);
        BufferIO::EncodeUTF8(fpath, upath); dataManager.LoadStrings(upath);
        dataManager.LoadStrings(upath); #endif
        return; }
        }
        #endif // YGOPRO_SERVER_MODE
        if (!std::wcscmp(name, L"lflist.conf")) {
        deckManager.LoadLFListSingle(fpath, true);
        return; return;
        } }
        #if defined(SERVER_ZIP_SUPPORT) || !defined(YGOPRO_SERVER_MODE) #if defined(SERVER_ZIP_SUPPORT) || !defined(YGOPRO_SERVER_MODE)
        ......
        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