Merge remote-tracking branch 'upstream/master' into develop

.gitignore

@@ -8,6 +8,8 @@
 /pics
 /replay
 /single
+/sound
+!/sound/files.txt
 /WindBot
 /cards.cdb
 /error.log

gframe/config.h

@@ -72,6 +72,21 @@ inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
 	return fp;
 }
 
+#if !defined(_WIN32)
+#define myfopen std::fopen
+#elif defined(WDK_NTDDI_VERSION) && (WDK_NTDDI_VERSION >= 0x0A000005) // Redstone 4, Version 1803, Build 17134.
+#define FOPEN_WINDOWS_SUPPORT_UTF8
+#define myfopen std::fopen
+#else
+inline FILE* myfopen(const char* filename, const char* mode) {
+	wchar_t wfilename[256]{};
+	BufferIO::DecodeUTF8(filename, wfilename);
+	wchar_t wmode[20]{};
+	BufferIO::CopyCharArray(mode, wmode);
+	return _wfopen(wfilename, wmode);
+}
+#endif
+
 #include <irrlicht.h>
 
 extern const unsigned short PRO_VERSION;

gframe/data_manager.cpp

@@ -108,7 +108,7 @@ bool DataManager::LoadDB(const wchar_t* wfile) {
 	return ret;
 }
 bool DataManager::LoadStrings(const char* file) {
-	FILE* fp = std::fopen(file, "r");
+	FILE* fp = myfopen(file, "r");
 	if(!fp)
 		return false;
 	char linebuf[TEXT_LINE_SIZE]{};
@@ -431,9 +431,7 @@ unsigned char* DataManager::ReadScriptFromIrrFS(const char* script_name, int* sl
 	return scriptBuffer;
 }
 unsigned char* DataManager::ReadScriptFromFile(const char* script_name, int* slen) {
-	wchar_t fname[256]{};
-	BufferIO::DecodeUTF8(script_name, fname);
-	FILE* fp = mywfopen(fname, "rb");
+	FILE* fp = myfopen(script_name, "rb");
 	if (!fp)
 		return nullptr;
 	size_t len = std::fread(scriptBuffer, 1, sizeof scriptBuffer, fp);

gframe/deck_manager.cpp

@@ -10,7 +10,7 @@ DeckManager deckManager;
 
 void DeckManager::LoadLFListSingle(const char* path) {
 	auto cur = _lfList.rend();
-	FILE* fp = std::fopen(path, "r");
+	FILE* fp = myfopen(path, "r");
 	char linebuf[256]{};
 	wchar_t strBuffer[256]{};
 	char str1[16]{};
@@ -311,7 +311,7 @@ bool DeckManager::LoadCurrentDeck(int category_index, const wchar_t* category_na
 		mainGame->deckBuilder.RefreshPackListScroll();
 	return res;
 }
-bool DeckManager::SaveDeck(Deck& deck, const wchar_t* file) {
+bool DeckManager::SaveDeck(const Deck& deck, const wchar_t* file) {
 	if(!FileSystem::IsDirExists(L"./deck") && !FileSystem::MakeDir(L"./deck"))
 		return false;
 	FILE* fp = OpenDeckFile(file, "w");
@@ -319,26 +319,18 @@ bool DeckManager::SaveDeck(Deck& deck, const wchar_t* file) {
 		return false;
 	std::fprintf(fp, "#created by ...\n#main\n");
 	for(size_t i = 0; i < deck.main.size(); ++i)
-		std::fprintf(fp, "%d\n", deck.main[i]->first);
+		std::fprintf(fp, "%u\n", deck.main[i]->first);
 	std::fprintf(fp, "#extra\n");
 	for(size_t i = 0; i < deck.extra.size(); ++i)
-		std::fprintf(fp, "%d\n", deck.extra[i]->first);
+		std::fprintf(fp, "%u\n", deck.extra[i]->first);
 	std::fprintf(fp, "!side\n");
 	for(size_t i = 0; i < deck.side.size(); ++i)
-		std::fprintf(fp, "%d\n", deck.side[i]->first);
+		std::fprintf(fp, "%u\n", deck.side[i]->first);
 	std::fclose(fp);
 	return true;
 }
 bool DeckManager::DeleteDeck(const wchar_t* file) {
-#ifdef _WIN32
-	BOOL result = DeleteFileW(file);
-	return !!result;
-#else
-	char filefn[256];
-	BufferIO::EncodeUTF8(file, filefn);
-	int result = unlink(filefn);
-	return result == 0;
-#endif
+	return FileSystem::RemoveFile(file);
 }
 bool DeckManager::CreateCategory(const wchar_t* name) {
 	if(!FileSystem::IsDirExists(L"./deck") && !FileSystem::MakeDir(L"./deck"))

gframe/deck_manager.h

@@ -58,7 +58,7 @@ public:
 	static void GetDeckFile(wchar_t* ret, int category_index, const wchar_t* category_name, const wchar_t* deckname);
 	static FILE* OpenDeckFile(const wchar_t* file, const char* mode);
 	static irr::io::IReadFile* OpenDeckReader(const wchar_t* file);
-	static bool SaveDeck(Deck& deck, const wchar_t* file);
+	static bool SaveDeck(const Deck& deck, const wchar_t* file);
 	static bool DeleteDeck(const wchar_t* file);
 	static bool CreateCategory(const wchar_t* name);
 	static bool RenameCategory(const wchar_t* oldname, const wchar_t* newname);

gframe/duelclient.cpp

@@ -3868,7 +3868,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
 		break;
 	}
 	case MSG_RELOAD_FIELD: {
-		mainGame->gMutex.lock();
+		if(!mainGame->dInfo.isReplay || !mainGame->dInfo.isReplaySkiping) {
+			mainGame->gMutex.lock();
+		}
 		mainGame->dField.Clear();
 		mainGame->dInfo.duel_rule = BufferIO::ReadUInt8(pbuf);
 		int val = 0;
@@ -3974,7 +3976,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
 			myswprintf(event_string, dataManager.GetSysString(1609), dataManager.GetName(mainGame->dField.current_chain.code));
 			mainGame->dField.last_chain = true;
 		}
-		mainGame->gMutex.unlock();
+		if(!mainGame->dInfo.isReplay || !mainGame->dInfo.isReplaySkiping) {
+			mainGame->gMutex.unlock();
+		}
 		break;
 	}
 	}

gframe/game.cpp

@@ -106,6 +106,9 @@ bool Game::Initialize() {
 	numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
 	if(!numFont) {
 		const wchar_t* numFontPaths[] = {
+			L"./fonts/numFont.ttf",
+			L"./fonts/numFont.ttc",
+			L"./fonts/numFont.otf",
 			L"C:/Windows/Fonts/arialbd.ttf",
 			L"/usr/share/fonts/truetype/DroidSansFallbackFull.ttf",
 			L"/usr/share/fonts/opentype/noto/NotoSansCJK-Bold.ttc",
@@ -113,9 +116,6 @@ bool Game::Initialize() {
 			L"/usr/share/fonts/noto-cjk/NotoSansCJK-Bold.ttc",
 			L"/System/Library/Fonts/SFNSTextCondensed-Bold.otf",
 			L"/System/Library/Fonts/SFNS.ttf",
-			L"./fonts/numFont.ttf",
-			L"./fonts/numFont.ttc",
-			L"./fonts/numFont.otf"
 		};
 		for(const wchar_t* path : numFontPaths) {
 			BufferIO::CopyWideString(path, gameConf.numfont);
@@ -127,6 +127,9 @@ bool Game::Initialize() {
 	textFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, gameConf.textfontsize);
 	if(!textFont) {
 		const wchar_t* textFontPaths[] = {
+			L"./fonts/textFont.ttf",
+			L"./fonts/textFont.ttc",
+			L"./fonts/textFont.otf",
 			L"C:/Windows/Fonts/msyh.ttc",
 			L"C:/Windows/Fonts/msyh.ttf",
 			L"C:/Windows/Fonts/simsun.ttc",
@@ -138,9 +141,7 @@ bool Game::Initialize() {
 			L"/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
 			L"/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
 			L"/System/Library/Fonts/PingFang.ttc",
-			L"./fonts/textFont.ttf",
-			L"./fonts/textFont.ttc",
-			L"./fonts/textFont.otf"
+			L"/System/Library/Fonts/STHeiti Medium.ttc",
 		};
 		for(const wchar_t* path : textFontPaths) {
 			BufferIO::CopyWideString(path, gameConf.textfont);
@@ -158,7 +159,7 @@ bool Game::Initialize() {
 			}
 		});
 		if(fpath[0] == 0) {
-			ErrorLog("Failed to load font(s)!");
+			ErrorLog("No fonts found! Please place appropriate font file in the fonts directory, or edit system.conf manually.");
 			return false;
 		}
 		if(!numFont) {
@@ -170,6 +171,10 @@ bool Game::Initialize() {
 			textFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, gameConf.textfontsize);
 		}
 	}
+	if(!numFont || !textFont) {
+		ErrorLog("Failed to load font(s)!");
+		return false;
+	}
 	adFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 12);
 	lpcFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 48);
 	guiFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, gameConf.textfontsize);
@@ -1290,7 +1295,7 @@ void Game::RefreshBot() {
 	if(!gameConf.enable_bot_mode)
 		return;
 	botInfo.clear();
-	FILE* fp = std::fopen("bot.conf", "r");
+	FILE* fp = myfopen("bot.conf", "r");
 	char linebuf[256]{};
 	char strbuf[256]{};
 	if(fp) {
@@ -1343,7 +1348,7 @@ void Game::RefreshBot() {
 	}
 }
 void Game::LoadConfig() {
-	FILE* fp = std::fopen("system.conf", "r");
+	FILE* fp = myfopen("system.conf", "r");
 	if(!fp)
 		return;
 	char linebuf[CONFIG_LINE_SIZE]{};
@@ -1361,14 +1366,6 @@ void Game::LoadConfig() {
 		} else if(!std::strcmp(strbuf, "errorlog")) {
 			unsigned int val = std::strtol(valbuf, nullptr, 10);
 			enable_log = val & 0xff;
-		} else if(!std::strcmp(strbuf, "textfont")) {
-			int textfontsize = 0;
-			if (std::sscanf(linebuf, "%63s = %959s %d", strbuf, valbuf, &textfontsize) != 3)
-				continue;
-			gameConf.textfontsize = textfontsize;
-			BufferIO::DecodeUTF8(valbuf, gameConf.textfont);
-		} else if(!std::strcmp(strbuf, "numfont")) {
-			BufferIO::DecodeUTF8(valbuf, gameConf.numfont);
 		} else if(!std::strcmp(strbuf, "serverport")) {
 			gameConf.serverport = std::strtol(valbuf, nullptr, 10);
 		} else if(!std::strcmp(strbuf, "lasthost")) {
@@ -1463,7 +1460,18 @@ void Game::LoadConfig() {
 			// options allowing multiple words
 			if (std::sscanf(linebuf, "%63s = %959[^\n]", strbuf, valbuf) != 2)
 				continue;
-			if (!std::strcmp(strbuf, "nickname")) {
+			if (!std::strcmp(strbuf, "textfont")) {
+				char* last_space = std::strrchr(valbuf, ' ');
+				if (last_space == nullptr)
+					continue;
+				int fontsize = std::strtol(last_space + 1, nullptr, 10);
+				if (fontsize > 0)
+					gameConf.textfontsize = fontsize;
+				*last_space = 0;
+				BufferIO::DecodeUTF8(valbuf, gameConf.textfont);
+			} else if (!std::strcmp(strbuf, "numfont")) {
+				BufferIO::DecodeUTF8(valbuf, gameConf.numfont);
+			} else if (!std::strcmp(strbuf, "nickname")) {
 				BufferIO::DecodeUTF8(valbuf, gameConf.nickname);
 			} else if (!std::strcmp(strbuf, "gamename")) {
 				BufferIO::DecodeUTF8(valbuf, gameConf.gamename);
@@ -1481,7 +1489,7 @@ void Game::LoadConfig() {
 	std::fclose(fp);
 }
 void Game::SaveConfig() {
-	FILE* fp = std::fopen("system.conf", "w");
+	FILE* fp = myfopen("system.conf", "w");
 	std::fprintf(fp, "#config file\n#nickname & gamename should be less than 20 characters\n");
 	char linebuf[CONFIG_LINE_SIZE];
 	std::fprintf(fp, "use_d3d = %d\n", gameConf.use_d3d ? 1 : 0);
@@ -1734,7 +1742,12 @@ void Game::AddDebugMsg(const char* msg) {
 	}
 }
 void Game::ErrorLog(const char* msg) {
-	FILE* fp = std::fopen("error.log", "a");
+#ifdef _WIN32
+	OutputDebugStringA(msg);
+#else
+	std::fprintf(stderr, "%s\n", msg);
+#endif
+	FILE* fp = myfopen("error.log", "a");
 	if(!fp)
 		return;
 	time_t nowtime = std::time(nullptr);

gframe/gframe.cpp

@@ -23,8 +23,12 @@ void ClickButton(irr::gui::IGUIElement* btn) {
 }
 
 int main(int argc, char* argv[]) {
-#ifndef _WIN32
+#if defined(FOPEN_WINDOWS_SUPPORT_UTF8)
+	std::setlocale(LC_CTYPE, ".UTF-8");
+#elif defined(__APPLE__)
 	std::setlocale(LC_CTYPE, "UTF-8");
+#elif !defined(_WIN32)
+	std::setlocale(LC_CTYPE, "");
 #endif
 #ifdef __APPLE__
 	CFURLRef bundle_url = CFBundleCopyBundleURL(CFBundleGetMainBundle());

gframe/myfilesystem.h

@@ -86,6 +86,14 @@ public:
 		return DeleteDir(wdir);
 	}
 
+	static bool RemoveFile(const wchar_t* wfile) {
+		return DeleteFileW(wfile);
+	}
+
+	static bool RemoveFile(const char* file) {
+		return DeleteFileA(file);
+	}
+
 	static void TraversalDir(const wchar_t* wpath, const std::function<void(const wchar_t*, bool)>& cb) {
 		wchar_t findstr[1024];
 		std::swprintf(findstr, sizeof findstr / sizeof findstr[0], L"%ls/*", wpath);
@@ -195,6 +203,16 @@ public:
 		return success;
 	}
 
+	static bool RemoveFile(const wchar_t* wfile) {
+		char file[1024];
+		BufferIO::EncodeUTF8(wfile, file);
+		return RemoveFile(file);
+	}
+
+	static bool RemoveFile(const char* file) {
+		return unlink(file) == 0;
+	}
+
 	struct file_unit {
 		std::string filename;
 		bool is_dir;

gframe/network.h

@@ -27,7 +27,7 @@ struct HostInfo {
 	uint8_t no_shuffle_deck{};
 	// byte padding[3]
 
-	uint32_t start_lp{};
+	int32_t start_lp{};
 	uint8_t start_hand{};
 	uint8_t draw_count{};
 	uint16_t time_limit{};

gframe/premake5.lua

@@ -68,7 +68,6 @@ project "YGOPro"
     filter "system:windows"
         defines { "_IRR_WCHAR_FILESYSTEM" }
         files "ygopro.rc"
-        libdirs { "$(DXSDK_DIR)Lib/x86" }
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
         if USE_AUDIO and AUDIO_LIB == "irrklang" then
             links { "irrKlang" }

gframe/replay.cpp

@@ -24,7 +24,7 @@ void Replay::BeginRecord() {
 #else
 	if(is_recording)
 		std::fclose(fp);
-	fp = std::fopen("./replay/_LastReplay.yrp", "wb");
+	fp = myfopen("./replay/_LastReplay.yrp", "wb");
 	if(!fp)
 		return;
 #endif
@@ -154,15 +154,7 @@ bool Replay::CheckReplay(const wchar_t* name) {
 bool Replay::DeleteReplay(const wchar_t* name) {
 	wchar_t fname[256];
 	myswprintf(fname, L"./replay/%ls", name);
-#ifdef _WIN32
-	BOOL result = DeleteFileW(fname);
-	return !!result;
-#else
-	char filefn[256];
-	BufferIO::EncodeUTF8(fname, filefn);
-	int result = unlink(filefn);
-	return result == 0;
-#endif
+	return FileSystem::RemoveFile(fname);
 }
 bool Replay::RenameReplay(const wchar_t* oldname, const wchar_t* newname) {
 	wchar_t oldfname[256];

gframe/replay.h

@@ -17,13 +17,13 @@ constexpr int MAX_REPLAY_SIZE = 0x20000;
 constexpr int MAX_COMP_SIZE = UINT16_MAX + 1;
 
 struct ReplayHeader {
-	unsigned int id{};
-	unsigned int version{};
-	unsigned int flag{};
-	unsigned int seed{};
-	unsigned int datasize{};
-	unsigned int start_time{};
-	unsigned char props[8]{};
+	uint32_t id{};
+	uint32_t version{};
+	uint32_t flag{};
+	uint32_t seed{};
+	uint32_t datasize{};
+	uint32_t start_time{};
+	uint8_t props[8]{};
 };
 
 class Replay {

ocgcore @ d55f7ad9

-Subproject commit 74c7c053a393f397758c798e2860ab5972b56338
+Subproject commit d55f7ad9a123f1ef2cdc419d49a582e0cfeb4b36

premake/event/premake5.lua

@@ -11,3 +11,4 @@ project "event"
     filter "system:windows"
         prebuildcommands { "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code $(ProjectDir)..\\event\\include" }
         files { "win32select.c", "evthread_win32.c", "buffer_iocp.c", "event_iocp.c", "bufferevent_async.c" }
+        defines { "WIN32" } -- quirk of old libevent

premake/irrlicht/defines.lua

-defines {
-	"_IRR_STATIC_LIB_",
-	"NO_IRR_USE_NON_SYSTEM_BZLIB_",
-	"NO_IRR_COMPILE_WITH_BZIP2_",
-	"NO_IRR_COMPILE_WITH_CONSOLE_DEVICE_",
-	"NO_IRR_COMPILE_WITH_DIRECT3D_8_",
-	"NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_",
-	"NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_",
-	"NO_IRR_COMPILE_WITH_SOFTWARE_",
-	"NO_IRR_COMPILE_WITH_BURNINGSVIDEO_",
-	"NO_IRR_COMPILE_WITH_IRR_SCENE_LOADER_",
-	"NO_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_",
-	"NO_IRR_COMPILE_WITH_IRR_MESH_LOADER_",
-	"NO_IRR_COMPILE_WITH_HALFLIFE_LOADER_",
-	"NO_IRR_COMPILE_WITH_MD2_LOADER_",
-	"NO_IRR_COMPILE_WITH_MD3_LOADER_",
-	"NO_IRR_COMPILE_WITH_3DS_LOADER_",
-	"NO_IRR_COMPILE_WITH_COLLADA_LOADER_",
-	"NO_IRR_COMPILE_WITH_CSM_LOADER_",
-	"NO_IRR_COMPILE_WITH_BSP_LOADER_",
-	"NO_IRR_COMPILE_WITH_DMF_LOADER_",
-	"NO_IRR_COMPILE_WITH_LMTS_LOADER_",
-	"NO_IRR_COMPILE_WITH_MY3D_LOADER_",
-	"NO_IRR_COMPILE_WITH_OBJ_LOADER_",
-	"NO_IRR_COMPILE_WITH_OCT_LOADER_",
-	"NO_IRR_COMPILE_WITH_LWO_LOADER_",
-	"NO_IRR_COMPILE_WITH_STL_LOADER_",
-	"NO_IRR_COMPILE_WITH_PLY_LOADER_",
-	"NO_IRR_COMPILE_WITH_SMF_LOADER_",
-	"NO_IRR_COMPILE_WITH_IRR_WRITER_",
-	"NO_IRR_COMPILE_WITH_COLLADA_WRITER_",
-	"NO_IRR_COMPILE_WITH_STL_WRITER_",
-	"NO_IRR_COMPILE_WITH_OBJ_WRITER_",
-	"NO_IRR_COMPILE_WITH_PLY_WRITER_",
-	"NO_IRR_COMPILE_WITH_PCX_LOADER_",
-	"NO_IRR_COMPILE_WITH_PPM_LOADER_",
-	"NO_IRR_COMPILE_WITH_PSD_LOADER_",
-	"NO_IRR_COMPILE_WITH_TGA_LOADER_",
-	"NO_IRR_COMPILE_WITH_WAL_LOADER_",
-	"NO_IRR_COMPILE_WITH_LMP_LOADER_",
-	"NO_IRR_COMPILE_WITH_RGB_LOADER_",
-	"NO_IRR_COMPILE_WITH_PCX_WRITER_",
-	"NO_IRR_COMPILE_WITH_PPM_WRITER_",
-	"NO_IRR_COMPILE_WITH_PSD_WRITER_",
-	"NO_IRR_COMPILE_WITH_TGA_WRITER_",
-	"NO__IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_",
-	"NO__IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_",
-	"NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_",
-}

premake5.lua

@@ -218,7 +218,6 @@ workspace "YGOPro"
     configurations { "Release", "Debug" }
 
     filter "system:windows"
-        defines { "WIN32", "_WIN32" }
         entrypoint "mainCRTStartup"
         systemversion "latest"
         startproject "YGOPro"

strings.conf

@@ -1251,3 +1251,6 @@
 !setname 0x1c6 统王	ドミナス
 !setname 0x1c7 塞勒凯特	Serket
 !setname 0x1c8 阿匹卜	Apophis
+!setname 0x1c9 星辰	ドラゴンテイル
+!setname 0x1ca 味美喵	ヤミー
+!setname 0x1cb K9