Merge branch 'master' into server

32f22ae8 · nanahira · df5b64ba · 40395329 · 32f22ae8
Commit 32f22ae8 authored May 01, 2020 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -1082,14 +1082,10 @@ void Game::LoadExpansions() {
 			myswprintf(fpath, L"./expansions/%ls", name);
 			dataManager.LoadDB(fpath);
 		}
-<<<<<<< HEAD
 #ifdef YGOPRO_SERVER_MODE
 	});
 #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))) {
->>>>>>> master
 			wchar_t fpath[1024];
 			myswprintf(fpath, L"./expansions/%ls", name);
 #ifdef _WIN32