Merge branch 'master' of github.com:Fluorohydride/ygopro into develop

gframe/deck_con.cpp

@@ -47,7 +47,7 @@ static inline bool havePopupWindow() {
 }
 
 static inline void get_deck_file(wchar_t* ret) {
-	deckManager.GetDeckFile(ret, mainGame->cbDBCategory->getSelected(), mainGame->cbDBCategory->getText(), mainGame->cbDBDecks->getText());
+	DeckManager::GetDeckFile(ret, mainGame->cbDBCategory->getSelected(), mainGame->cbDBCategory->getText(), mainGame->cbDBDecks->getText());
 }
 
 static inline void load_current_deck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck) {
@@ -185,7 +185,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					break;
 				wchar_t filepath[256];
 				get_deck_file(filepath);
-				if(deckManager.SaveDeck(deckManager.current_deck, filepath)) {
+				if(DeckManager::SaveDeck(deckManager.current_deck, filepath)) {
 					mainGame->stACMessage->setText(dataManager.GetSysString(1335));
 					mainGame->PopupElement(mainGame->wACMessage, 20);
 					is_modified = false;
@@ -211,10 +211,10 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				}
 				int catesel = mainGame->cbDBCategory->getSelected();
 				wchar_t catepath[256];
-				deckManager.GetCategoryPath(catepath, catesel, mainGame->cbDBCategory->getText());
+				DeckManager::GetCategoryPath(catepath, catesel, mainGame->cbDBCategory->getText());
 				wchar_t filepath[256];
 				myswprintf(filepath, L"%ls/%ls.ydk", catepath, dname);
-				if(deckManager.SaveDeck(deckManager.current_deck, filepath)) {
+				if(DeckManager::SaveDeck(deckManager.current_deck, filepath)) {
 					mainGame->stACMessage->setText(dataManager.GetSysString(1335));
 					mainGame->PopupElement(mainGame->wACMessage, 20);
 					is_modified = false;
@@ -437,7 +437,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				case BUTTON_NEW_CATEGORY: {
 					int catesel = 0;
 					const wchar_t* catename = mainGame->ebDMName->getText();
-					if(deckManager.CreateCategory(catename)) {
+					if(DeckManager::CreateCategory(catename)) {
 						mainGame->cbDBCategory->addItem(catename);
 						mainGame->lstCategories->addItem(catename);
 						catesel = mainGame->lstCategories->getItemCount() - 1;
@@ -464,7 +464,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					int catesel = mainGame->lstCategories->getSelected();
 					const wchar_t* oldcatename = mainGame->lstCategories->getListItem(catesel);
 					const wchar_t* newcatename = mainGame->ebDMName->getText();
-					if(deckManager.RenameCategory(oldcatename, newcatename)) {
+					if(DeckManager::RenameCategory(oldcatename, newcatename)) {
 						mainGame->cbDBCategory->removeItem(catesel);
 						mainGame->cbDBCategory->addItem(newcatename);
 						mainGame->lstCategories->removeItem(catesel);
@@ -493,7 +493,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				case BUTTON_DELETE_CATEGORY: {
 					int catesel = mainGame->lstCategories->getSelected();
 					const wchar_t* catename = mainGame->lstCategories->getListItem(catesel);
-					if(deckManager.DeleteCategory(catename)) {
+					if(DeckManager::DeleteCategory(catename)) {
 						mainGame->cbDBCategory->removeItem(catesel);
 						mainGame->lstCategories->removeItem(catesel);
 						catesel = 2;
@@ -511,7 +511,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				case BUTTON_NEW_DECK: {
 					const wchar_t* deckname = mainGame->ebDMName->getText();
 					wchar_t catepath[256];
-					deckManager.GetCategoryPath(catepath, mainGame->cbDBCategory->getSelected(), mainGame->cbDBCategory->getText());
+					DeckManager::GetCategoryPath(catepath, mainGame->cbDBCategory->getSelected(), mainGame->cbDBCategory->getText());
 					wchar_t filepath[256];
 					myswprintf(filepath, L"%ls/%ls.ydk", catepath, deckname);
 					bool res = false;
@@ -519,7 +519,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 						deckManager.current_deck.main.clear();
 						deckManager.current_deck.extra.clear();
 						deckManager.current_deck.side.clear();
-						res = deckManager.SaveDeck(deckManager.current_deck, filepath);
+						res = DeckManager::SaveDeck(deckManager.current_deck, filepath);
 						RefreshDeckList();
 						ChangeCategory(mainGame->lstCategories->getSelected());
 					}
@@ -576,7 +576,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					int decksel = mainGame->lstDecks->getSelected();
 					wchar_t filepath[256];
 					get_deck_file(filepath);
-					if(deckManager.DeleteDeck(filepath)) {
+					if(DeckManager::DeleteDeck(filepath)) {
 						mainGame->lstDecks->removeItem(decksel);
 						mainGame->cbDBDecks->removeItem(decksel);
 						decksel--;
@@ -652,7 +652,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					}
 					bool res = false;
 					if(!FileSystem::IsFileExists(newfilepath)) {
-						res = deckManager.SaveDeck(deckManager.current_deck, newfilepath);
+						res = DeckManager::SaveDeck(deckManager.current_deck, newfilepath);
 					}
 					mainGame->lstCategories->setSelected(newcatename);
 					int catesel = mainGame->lstCategories->getSelected();
@@ -753,7 +753,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					mainGame->cbDBDecks->setSelected(sel);
 					wchar_t filepath[256];
 					get_deck_file(filepath);
-					if(deckManager.DeleteDeck(filepath)) {
+					if(DeckManager::DeleteDeck(filepath)) {
 						mainGame->cbDBDecks->removeItem(sel);
 						int count = mainGame->cbDBDecks->getItemCount();
 						if(sel >= count)
@@ -1048,7 +1048,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					break;
 				wchar_t filepath[256];
 				wchar_t catepath[256];
-				deckManager.GetCategoryPath(catepath, mainGame->lstCategories->getSelected(), mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()));
+				DeckManager::GetCategoryPath(catepath, mainGame->lstCategories->getSelected(), mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()));
 				myswprintf(filepath, L"%ls/%ls.ydk", catepath, mainGame->lstDecks->getListItem(decksel));
 				deckManager.LoadCurrentDeck(filepath, showing_pack);
 				RefreshPackListScroll();
@@ -1653,7 +1653,7 @@ void DeckBuilder::RefreshDeckList() {
 	irr::gui::IGUIListBox* lstCategories = mainGame->lstCategories;
 	irr::gui::IGUIListBox* lstDecks = mainGame->lstDecks;
 	wchar_t catepath[256];
-	deckManager.GetCategoryPath(catepath, lstCategories->getSelected(), lstCategories->getListItem(lstCategories->getSelected()));
+	DeckManager::GetCategoryPath(catepath, lstCategories->getSelected(), lstCategories->getListItem(lstCategories->getSelected()));
 	lstDecks->clear();
 	mainGame->RefreshDeck(catepath, [lstDecks](const wchar_t* item) { lstDecks->addItem(item); });
 }

gframe/deck_manager.cpp

@@ -14,6 +14,7 @@ void DeckManager::LoadLFListSingle(const char* path) {
 	FILE* fp = myfopen(path, "r");
 	char linebuf[256]{};
 	wchar_t strBuffer[256]{};
+	char str1[16]{};
 	if(fp) {
 		while(std::fgets(linebuf, sizeof linebuf, fp)) {
 			if(linebuf[0] == '#')
@@ -33,10 +34,11 @@ void DeckManager::LoadLFListSingle(const char* path) {
 				continue;
 			unsigned int code = 0;
 			int count = -1;
-			if (std::sscanf(linebuf, "%9u%*[ ]%9d", &code, &count) != 2)
+			if (std::sscanf(linebuf, "%10s%*[ ]%1d", str1, &count) != 2)
 				continue;
 			if (count < 0 || count > 2)
 				continue;
+			code = std::strtoul(str1, nullptr, 10);
 			cur->content[code] = count;
 			cur->hash = cur->hash ^ ((code << 18) | (code >> 14)) ^ ((code << (27 + count)) | (code >> (5 - count)));
 		}
@@ -143,13 +145,12 @@ unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int r
 	}
 	return 0;
 }
-int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_packlist) {
+uint32_t DeckManager::LoadDeck(Deck& deck, uint32_t dbuf[], int mainc, int sidec, bool is_packlist) {
 	deck.clear();
-	int code;
-	int errorcode = 0;
+	uint32_t errorcode = 0;
 	CardData cd;
 	for(int i = 0; i < mainc; ++i) {
-		code = dbuf[i];
+		auto code = dbuf[i];
 		if(!dataManager.GetData(code, &cd)) {
 			errorcode = code;
 			continue;
@@ -172,7 +173,7 @@ int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_p
 		}
 	}
 	for(int i = 0; i < sidec; ++i) {
-		code = dbuf[mainc + i];
+		auto code = dbuf[mainc + i];
 		if(!dataManager.GetData(code, &cd)) {
 			errorcode = code;
 			continue;
@@ -186,22 +187,21 @@ int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_p
 	}
 	return errorcode;
 }
-int DeckManager::LoadDeck(Deck& deck, std::istringstream& deckStream, bool is_packlist) {
-	size_t ct = 0;
-	int mainc = 0, sidec = 0, code = 0;
-	int cardlist[PACK_MAX_SIZE]{};
+uint32_t DeckManager::LoadDeckFromStream(Deck& deck, std::istringstream& deckStream, bool is_packlist) {
+	int ct = 0;
+	int mainc = 0, sidec = 0;
+	uint32_t cardlist[PACK_MAX_SIZE]{};
 	bool is_side = false;
 	std::string linebuf;
-	while (std::getline(deckStream, linebuf, '\n') && ct < (sizeof cardlist / sizeof cardlist[0])) {
+	while (std::getline(deckStream, linebuf, '\n') && ct < PACK_MAX_SIZE) {
 		if (linebuf[0] == '!') {
 			is_side = true;
 			continue;
 		}
 		if (linebuf[0] < '0' || linebuf[0] > '9')
 			continue;
-		errno = 0;
-		code = std::strtol(linebuf.c_str(), nullptr, 10);
-		if (errno == ERANGE)
+		auto code = std::strtoul(linebuf.c_str(), nullptr, 10);
+		if (code >= UINT32_MAX)
 			continue;
 		cardlist[ct++] = code;
 		if (is_side)
@@ -211,15 +211,15 @@ int DeckManager::LoadDeck(Deck& deck, std::istringstream& deckStream, bool is_pa
 	}
 	return LoadDeck(deck, cardlist, mainc, sidec, is_packlist);
 }
-bool DeckManager::LoadSide(Deck& deck, int* dbuf, int mainc, int sidec) {
-	std::unordered_map<int, int> pcount;
-	std::unordered_map<int, int> ncount;
+bool DeckManager::LoadSide(Deck& deck, uint32_t dbuf[], int mainc, int sidec) {
+	std::unordered_map<uint32_t, int> pcount;
+	std::unordered_map<uint32_t, int> ncount;
 	for(size_t i = 0; i < deck.main.size(); ++i)
-		++pcount[deck.main[i]->first];
+		pcount[deck.main[i]->first]++;
 	for(size_t i = 0; i < deck.extra.size(); ++i)
-		++pcount[deck.extra[i]->first];
+		pcount[deck.extra[i]->first]++;
 	for(size_t i = 0; i < deck.side.size(); ++i)
-		++pcount[deck.side[i]->first];
+		pcount[deck.side[i]->first]++;
 	Deck ndeck;
 	LoadDeck(ndeck, dbuf, mainc, sidec);
 #ifndef YGOPRO_NO_SIDE_CHECK
@@ -227,11 +227,11 @@ bool DeckManager::LoadSide(Deck& deck, int* dbuf, int mainc, int sidec) {
 		return false;
 #endif
 	for(size_t i = 0; i < ndeck.main.size(); ++i)
-		++ncount[ndeck.main[i]->first];
+		ncount[ndeck.main[i]->first]++;
 	for(size_t i = 0; i < ndeck.extra.size(); ++i)
-		++ncount[ndeck.extra[i]->first];
+		ncount[ndeck.extra[i]->first]++;
 	for(size_t i = 0; i < ndeck.side.size(); ++i)
-		++ncount[ndeck.side[i]->first];
+		ncount[ndeck.side[i]->first]++;
 #ifndef YGOPRO_NO_SIDE_CHECK
 	for (auto& cdit : ncount)
 		if (cdit.second != pcount[cdit.first])
@@ -307,8 +307,8 @@ bool DeckManager::LoadCurrentDeck(const wchar_t* file, bool is_packlist) {
 		return false;
 	}
 	std::istringstream deckStream(deckBuffer);
-	LoadDeck(current_deck, deckStream, is_packlist);
-	return true;  // the above LoadDeck has return value but we ignore it here for now
+	LoadDeckFromStream(current_deck, deckStream, is_packlist);
+	return true;  // the above function has return value but we ignore it here for now
 }
 bool DeckManager::LoadCurrentDeck(int category_index, const wchar_t* category_name, const wchar_t* deckname) {
 	wchar_t filepath[256];
@@ -319,7 +319,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");
@@ -327,26 +327,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);
 }
 int DeckManager::TypeCount(std::vector<code_pointer> list, unsigned int ctype) {
 	int res = 0;
@@ -364,7 +356,7 @@ bool DeckManager::LoadDeckFromCode(Deck& deck, const unsigned char *code, int le
 		return false;
 	int mainc = BufferIO::ReadInt32(pdeck);
 	int sidec = BufferIO::ReadInt32(pdeck);
-	int errorcode = LoadDeck(deck, (int*)pdeck, mainc, sidec);
+	int errorcode = LoadDeck(deck, (uint32_t*)pdeck, mainc, sidec);
 	return (errorcode == 0);
 }
 int DeckManager::SaveDeckToCode(Deck& deck, unsigned char* code) {

gframe/deck_manager.h

@@ -63,25 +63,26 @@ public:
 	const wchar_t* GetLFListName(unsigned int lfhash);
 	const LFList* GetLFList(unsigned int lfhash);
 	unsigned int CheckDeck(const Deck& deck, unsigned int lfhash, int rule);
-	int LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_packlist = false);
-	int LoadDeck(Deck& deck, std::istringstream& deckStream, bool is_packlist = false);
-	bool LoadSide(Deck& deck, int* dbuf, int mainc, int sidec);
-	void GetCategoryPath(wchar_t* ret, int index, const wchar_t* text);
-	void GetDeckFile(wchar_t* ret, int category_index, const wchar_t* category_name, const wchar_t* deckname);
-	FILE* OpenDeckFile(const wchar_t* file, const char* mode);
-	irr::io::IReadFile* OpenDeckReader(const wchar_t* file);
 	bool LoadCurrentDeck(const wchar_t* file, bool is_packlist = false);
 	bool LoadCurrentDeck(int category_index, const wchar_t* category_name, const wchar_t* deckname);
-	bool SaveDeck(Deck& deck, const wchar_t* file);
-	bool DeleteDeck(const wchar_t* file);
 	wchar_t DeckFormatBuffer[128];
 	int TypeCount(std::vector<code_pointer> list, unsigned int ctype);
 	bool LoadDeckFromCode(Deck& deck, const unsigned char *code, int len);
 	int SaveDeckToCode(Deck &deck, unsigned char *code);
-	bool CreateCategory(const wchar_t* name);
-	bool RenameCategory(const wchar_t* oldname, const wchar_t* newname);
-	bool DeleteCategory(const wchar_t* name);
 	bool SaveDeckBuffer(const int deckbuf[], const wchar_t* name);
+
+	static uint32_t LoadDeck(Deck& deck, uint32_t dbuf[], int mainc, int sidec, bool is_packlist = false);
+	static uint32_t LoadDeckFromStream(Deck& deck, std::istringstream& deckStream, bool is_packlist = false);
+	static bool LoadSide(Deck& deck, uint32_t dbuf[], int mainc, int sidec);
+	static void GetCategoryPath(wchar_t* ret, int index, const wchar_t* text);
+	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(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);
+	static bool DeleteCategory(const wchar_t* name);
 };
 
 extern DeckManager deckManager;

gframe/duelclient.cpp

@@ -4127,7 +4127,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;
@@ -4233,7 +4235,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

@@ -146,6 +146,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",
@@ -153,9 +156,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);
@@ -167,6 +167,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",
@@ -178,9 +181,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);
@@ -198,7 +199,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) {
@@ -210,6 +211,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);
@@ -1335,7 +1340,7 @@ void Game::RefreshDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBo
 		return;
 	}
 	wchar_t catepath[256];
-	deckManager.GetCategoryPath(catepath, cbCategory->getSelected(), cbCategory->getText());
+	DeckManager::GetCategoryPath(catepath, cbCategory->getSelected(), cbCategory->getText());
 	cbDeck->clear();
 	RefreshDeck(catepath, [cbDeck](const wchar_t* item) { cbDeck->addItem(item); });
 }
@@ -1474,14 +1479,6 @@ bool Game::LoadConfigFromFile(const char* file) {
 		} 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")) {
@@ -1584,7 +1581,18 @@ bool Game::LoadConfigFromFile(const char* file) {
 			// 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);
@@ -1994,6 +2002,11 @@ void Game::AddDebugMsg(const char* msg) {
 	}
 }
 void Game::ErrorLog(const char* msg) {
+#ifdef _WIN32
+	OutputDebugStringA(msg);
+#else
+	std::fprintf(stderr, "%s\n", msg);
+#endif
 	FILE* fp = myfopen("error.log", "a");
 	if(!fp)
 		return;

gframe/gframe.cpp

@@ -28,7 +28,7 @@ int main(int argc, char* argv[]) {
 #if defined(FOPEN_WINDOWS_SUPPORT_UTF8)
 	std::setlocale(LC_CTYPE, ".UTF-8");
 #elif defined(__APPLE__)
-	std::setlocale(LC_CTYPE, "C.UTF-8");
+	std::setlocale(LC_CTYPE, "UTF-8");
 #elif !defined(_WIN32)
 	std::setlocale(LC_CTYPE, "");
 #endif

gframe/menu_handler.cpp

@@ -353,7 +353,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				wchar_t arg1[512];
 				if(mainGame->botInfo[sel].select_deckfile) {
 					wchar_t botdeck[256];
-					deckManager.GetDeckFile(botdeck, mainGame->cbBotDeckCategory->getSelected(), mainGame->cbBotDeckCategory->getText(), mainGame->cbBotDeck->getText());
+					DeckManager::GetDeckFile(botdeck, mainGame->cbBotDeckCategory->getSelected(), mainGame->cbBotDeckCategory->getText(), mainGame->cbBotDeck->getText());
 					myswprintf(arg1, L"%ls DeckFile='%ls'", mainGame->botInfo[sel].command, botdeck);
 				}
 				else
@@ -372,7 +372,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					wchar_t warg1[512];
 					if(mainGame->botInfo[sel].select_deckfile) {
 						wchar_t botdeck[256];
-						deckManager.GetDeckFile(botdeck, mainGame->cbBotDeckCategory->getSelected(), mainGame->cbBotDeckCategory->getText(), mainGame->cbBotDeck->getText());
+						DeckManager::GetDeckFile(botdeck, mainGame->cbBotDeckCategory->getSelected(), mainGame->cbBotDeckCategory->getText(), mainGame->cbBotDeck->getText());
 						myswprintf(warg1, L"%ls DeckFile='%ls'", mainGame->botInfo[sel].command, botdeck);
 					}
 					else

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{};
@@ -57,7 +57,7 @@ static_assert(sizeof(HostRequest) == 2, "size mismatch: HostRequest");
 struct CTOS_DeckData {
 	int32_t mainc{};
 	int32_t sidec{};
-	int32_t list[MAINC_MAX + SIDEC_MAX]{};
+	uint32_t list[MAINC_MAX + SIDEC_MAX]{};
 };
 check_trivially_copyable(CTOS_DeckData);
 

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", "Dnsapi" }
         if USE_AUDIO and AUDIO_LIB == "irrklang" then
             links { "irrKlang" }

gframe/replay.cpp

@@ -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 {

gframe/single_duel.cpp

@@ -299,9 +299,9 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
 		return;
 	}
 	if(duel_count == 0) {
-		deck_error[dp->type] = deckManager.LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec);
+		deck_error[dp->type] = DeckManager::LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec);
 	} else {
-		if(deckManager.LoadSide(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec)) {
+		if(DeckManager::LoadSide(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec)) {
 			ready[dp->type] = true;
 			NetServer::SendPacketToPlayer(dp, STOC_DUEL_START);
 			if(ready[0] && ready[1]) {

gframe/tag_duel.cpp

@@ -281,7 +281,7 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
 		NetServer::SendPacketToPlayer(dp, STOC_ERROR_MSG, scem);
 		return;
 	}
-	deck_error[dp->type] = deckManager.LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec);
+	deck_error[dp->type] = DeckManager::LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec);
 }
 void TagDuel::StartDuel(DuelPlayer* dp) {
 	if(dp != host_player)

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

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

strings.conf

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