Skip to content

Y
ygopro
Commit 32f22ae8 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents df5b64ba 40395329
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
gframe/game.cpp
View file @ 32f22ae8
...@@ -1082,14 +1082,10 @@ void Game::LoadExpansions() { ...@@ -1082,14 +1082,10 @@ void Game::LoadExpansions() {
myswprintf(fpath, L"./expansions/%ls", name); myswprintf(fpath, L"./expansions/%ls", name);
dataManager.LoadDB(fpath); dataManager.LoadDB(fpath);
} }
<<<<<<< HEAD
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
}); });
#else #else
if(!isdir && wcsrchr(name, '.') && !mywcsncasecmp(wcsrchr(name, '.'), L".zip", 4)) {
=======
if(!isdir && wcsrchr(name, '.') && (!mywcsncasecmp(wcsrchr(name, '.'), L".zip", 4) || !mywcsncasecmp(wcsrchr(name, '.'), L".ypk", 4))) { if(!isdir && wcsrchr(name, '.') && (!mywcsncasecmp(wcsrchr(name, '.'), L".zip", 4) || !mywcsncasecmp(wcsrchr(name, '.'), L".ypk", 4))) {
>>>>>>> master
wchar_t fpath[1024]; wchar_t fpath[1024];
myswprintf(fpath, L"./expansions/%ls", name); myswprintf(fpath, L"./expansions/%ls", name);
#ifdef _WIN32 #ifdef _WIN32
......
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