Merge branch 'fh' into patch-select-chain-forced

Author: mercury233

.github/workflows/build.yml

@@ -28,6 +28,7 @@
    john@suckerfreegames.com
 */
 
+#define _IRR_STATIC_LIB_
 #include <irrlicht.h>
 #include "CGUITTFont.h"
 

gframe/CGUITTFont.cpp

@@ -32,7 +32,7 @@ class BufferIO {
 	* @brief Copy a C-style string to another C-style string.
 	* @param src The source wide string
 	* @param pstr The destination char string
-	* @param bufsize The size of the destination buffer
+	* @param bufsize The length of the destination buffer
 	* @return The length of the copied string
 	*/
 	template<typename T1, typename T2>
@@ -62,13 +62,13 @@ class BufferIO {
 	}
 	template<size_t N>
 	static void CopyString(const char* src, char(&dst)[N]) {
-		dst[0] = 0;
-		std::strncat(dst, src, N - 1);
+		std::strncpy(dst, src, N - 1);
+		dst[N - 1] = 0;
 	}
 	template<size_t N>
 	static void CopyWideString(const wchar_t* src, wchar_t(&dst)[N]) {
-		dst[0] = 0;
-		std::wcsncat(dst, src, N - 1);
+		std::wcsncpy(dst, src, N - 1);
+		dst[N - 1] = 0;
 	}
 	template<typename T>
 	static bool CheckUTF8Byte(const T* str, int len) {

gframe/bufferio.h

@@ -6,7 +6,6 @@
 #include "image_manager.h"
 #include "game.h"
 #include "materials.h"
-#include "../ocgcore/common.h"
 
 namespace ygo {
 
@@ -15,7 +14,7 @@ ClientField::ClientField() {
 		mzone[p].resize(7, 0);
 		szone[p].resize(8, 0);
 	}
-	rnd.reset((uint_fast32_t)std::random_device()());
+	rnd.seed(std::random_device()());
 }
 ClientField::~ClientField() {
 	for (int i = 0; i < 2; ++i) {
@@ -119,28 +118,23 @@ void ClientField::Clear() {
 	tag_surrender = false;
 	tag_teammate_surrender = false;
 }
-void ClientField::Initial(int player, int deckc, int extrac) {
-	ClientCard* pcard;
-	for(int i = 0; i < deckc; ++i) {
-		pcard = new ClientCard;
-		deck[player].push_back(pcard);
-		pcard->owner = player;
-		pcard->controler = player;
-		pcard->location = LOCATION_DECK;
-		pcard->sequence = i;
-		pcard->position = POS_FACEDOWN_DEFENSE;
-		GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
-	}
-	for(int i = 0; i < extrac; ++i) {
-		pcard = new ClientCard;
-		extra[player].push_back(pcard);
-		pcard->owner = player;
-		pcard->controler = player;
-		pcard->location = LOCATION_EXTRA;
-		pcard->sequence = i;
-		pcard->position = POS_FACEDOWN_DEFENSE;
-		GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
-	}
+void ClientField::Initial(int player, int deckc, int extrac, int sidec) {
+	auto load_location = [&](std::vector<ClientCard*>& container, int count, uint8_t location) {
+		for(int i = 0; i < count; ++i) {
+			ClientCard* pcard = new ClientCard;
+			container.push_back(pcard);
+			pcard->owner = player;
+			pcard->controler = player;
+			pcard->location = location;
+			pcard->sequence = i;
+			pcard->position = POS_FACEDOWN_DEFENSE;
+			GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
+		}
+	};
+
+	load_location(deck[player], deckc, LOCATION_DECK);
+	load_location(extra[player], extrac, LOCATION_EXTRA);
+	load_location(remove[player], sidec, LOCATION_REMOVED);
 }
 void ClientField::ResetSequence(std::vector<ClientCard*>& list, bool reset_height) {
 	unsigned char seq = 0;
@@ -413,7 +407,7 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) {
 			}
 		}
 		if(has_card_in_grave) {
-			rnd.shuffle_vector(selectable_cards);
+			std::shuffle(selectable_cards.begin(), selectable_cards.end(), rnd);
 		}
 	}
 	int startpos;

gframe/client_field.cpp

@@ -2,7 +2,7 @@
 #define CLIENT_FIELD_H
 
 #include "config.h"
-#include "../ocgcore/mtrandom.h"
+#include <random>
 #include <vector>
 #include <set>
 #include <map>
@@ -90,12 +90,12 @@ class ClientField: public irr::IEventReceiver {
 	bool cant_check_grave{ false };
 	bool tag_surrender{ false };
 	bool tag_teammate_surrender{ false };
-	mt19937 rnd;
+	std::mt19937 rnd;
 
 	ClientField();
 	~ClientField();
 	void Clear();
-	void Initial(int player, int deckc, int extrac);
+	void Initial(int player, int deckc, int extrac, int sidec = 0);
 	void ResetSequence(std::vector<ClientCard*>& list, bool reset_height);
 	ClientCard* GetCard(int controler, int location, int sequence, int sub_seq = 0);
 	void AddCard(ClientCard* pcard, int controler, int location, int sequence);

gframe/client_field.h

@@ -13,7 +13,7 @@
 #include <windows.h>
 #include <ws2tcpip.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) or defined(__MINGW32__)
 #define mywcsncasecmp _wcsnicmp
 #define mystrncasecmp _strnicmp
 #else

gframe/config.h

@@ -165,8 +165,7 @@ void DataManager::ReadStringConfLine(const char* linebuf) {
 	}
 }
 bool DataManager::Error(sqlite3* pDB, sqlite3_stmt* pStmt) {
-	errmsg[0] = '\0';
-	std::strncat(errmsg, sqlite3_errmsg(pDB), sizeof errmsg - 1);
+	std::snprintf(errmsg, sizeof errmsg, "%s", sqlite3_errmsg(pDB));
 	if(pStmt)
 		sqlite3_finalize(pStmt);
 	return false;

gframe/data_manager.cpp

@@ -1,8 +1,7 @@
+#include <array>
 #include "config.h"
 #include "deck_con.h"
 #include "myfilesystem.h"
-#include "data_manager.h"
-#include "deck_manager.h"
 #include "image_manager.h"
 #include "sound_manager.h"
 #include "game.h"
@@ -54,6 +53,14 @@ static inline void load_current_deck(irr::gui::IGUIComboBox* cbCategory, irr::gu
 	deckManager.LoadCurrentDeck(cbCategory->getSelected(), cbCategory->getText(), cbDeck->getText());
 }
 
+DeckBuilder::DeckBuilder() {
+	std::random_device rd;
+	std::array<uint32_t, 8> seed{};
+	for (auto& x : seed)
+		x = rd();
+	std::seed_seq seq(seed.begin(), seed.end());
+	rnd.seed(seq);
+}
 void DeckBuilder::Initialize() {
 	mainGame->is_building = true;
 	mainGame->is_siding = false;
@@ -82,7 +89,6 @@ void DeckBuilder::Initialize() {
 		filterList = &deckManager._lfList.back();
 	}
 	ClearSearch();
-	rnd.reset((uint_fast32_t)std::time(nullptr));
 	mouse_pos.set(0, 0);
 	hovered_code = 0;
 	hovered_pos = 0;
@@ -175,7 +181,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 			case BUTTON_SHUFFLE_DECK: {
-				rnd.shuffle_vector(deckManager.current_deck.main);
+				std::shuffle(deckManager.current_deck.main.begin(), deckManager.current_deck.main.end(), rnd);
 				break;
 			}
 			case BUTTON_SAVE_DECK: {
@@ -388,6 +394,29 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				prev_operation = id;
 				break;
 			}
+			case BUTTON_IMPORT_DECK_CODE: {
+				time_t nowtime = std::time(nullptr);
+				wchar_t timetext[40];
+				std::wcsftime(timetext, sizeof timetext / sizeof timetext[0], L"%Y-%m-%d %H-%M-%S", std::localtime(&nowtime));
+				mainGame->gMutex.lock();
+				mainGame->stDMMessage->setText(dataManager.GetSysString(1471));
+				mainGame->ebDMName->setVisible(true);
+				mainGame->ebDMName->setText(timetext);
+				mainGame->PopupElement(mainGame->wDMQuery);
+				mainGame->gMutex.unlock();
+				prev_operation = id;
+				break;
+			}
+			case BUTTON_EXPORT_DECK_CODE: {
+				std::stringstream textStream;
+				deckManager.SaveDeck(deckManager.current_deck, textStream);
+				wchar_t text[0x10000];
+				BufferIO::DecodeUTF8(textStream.str().c_str(), text);
+				mainGame->env->getOSOperator()->copyToClipboard(text);
+				mainGame->stACMessage->setText(dataManager.GetSysString(1480));
+				mainGame->PopupElement(mainGame->wACMessage, 20);
+				break;
+			}
 			case BUTTON_DM_OK: {
 				switch(prev_operation) {
 				case BUTTON_NEW_CATEGORY: {
@@ -464,17 +493,28 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					}
 					break;
 				}
-				case BUTTON_NEW_DECK: {
+				case BUTTON_NEW_DECK:
+				case BUTTON_IMPORT_DECK_CODE: {
 					const wchar_t* deckname = mainGame->ebDMName->getText();
 					wchar_t catepath[256];
 					DeckManager::GetCategoryPath(catepath, mainGame->cbDBCategory->getSelected(), mainGame->cbDBCategory->getText());
 					wchar_t filepath[256];
 					myswprintf(filepath, L"%ls/%ls.ydk", catepath, deckname);
 					bool res = false;
 					if(!FileSystem::IsFileExists(filepath)) {
-						deckManager.current_deck.main.clear();
-						deckManager.current_deck.extra.clear();
-						deckManager.current_deck.side.clear();
+						if(prev_operation == BUTTON_NEW_DECK) {
+							deckManager.current_deck.main.clear();
+							deckManager.current_deck.extra.clear();
+							deckManager.current_deck.side.clear();
+						} else {
+							const wchar_t* txt = mainGame->env->getOSOperator()->getTextFromClipboard();
+							if(txt) {
+								char text[0x10000];
+								BufferIO::EncodeUTF8(txt, text);
+								std::istringstream textStream(text);
+								deckManager.LoadCurrentDeck(textStream);
+							}
+						}
 						res = DeckManager::SaveDeck(deckManager.current_deck, filepath);
 						RefreshDeckList();
 						ChangeCategory(mainGame->lstCategories->getSelected());

gframe/deck_con.cpp

@@ -3,15 +3,16 @@
 
 #include <unordered_map>
 #include <vector>
+#include <random>
 #include <irrlicht.h>
 #include "data_manager.h"
 #include "deck_manager.h"
-#include "../ocgcore/mtrandom.h"
 
 namespace ygo {
 
 class DeckBuilder: public irr::IEventReceiver {
 public:
+	DeckBuilder();
 	bool OnEvent(const irr::SEvent& event) override;
 	void Initialize();
 	void Terminate();
@@ -80,7 +81,7 @@ class DeckBuilder: public irr::IEventReceiver {
 	bool is_modified{};
 	bool readonly{};
 	bool showing_pack{};
-	mt19937 rnd;
+	std::mt19937 rnd;
 
 	const LFList* filterList{};
 	std::vector<code_pointer> results;

gframe/deck_con.h

@@ -277,6 +277,10 @@ irr::io::IReadFile* DeckManager::OpenDeckReader(const wchar_t* file) {
 #endif
 	return reader;
 }
+bool DeckManager::LoadCurrentDeck(std::istringstream& deckStream, bool is_packlist) {
+	LoadDeckFromStream(current_deck, deckStream, is_packlist);
+	return true;  // the above LoadDeck has return value but we ignore it here for now
+}
 bool DeckManager::LoadCurrentDeck(const wchar_t* file, bool is_packlist) {
 	current_deck.clear();
 	auto reader = OpenDeckReader(file);
@@ -311,21 +315,27 @@ bool DeckManager::LoadCurrentDeck(int category_index, const wchar_t* category_na
 		mainGame->deckBuilder.RefreshPackListScroll();
 	return res;
 }
+void DeckManager::SaveDeck(const Deck& deck, std::stringstream& deckStream) {
+	deckStream << "#created by ..." << std::endl;
+	deckStream << "#main" << std::endl;
+	for(size_t i = 0; i < deck.main.size(); ++i)
+		deckStream << deck.main[i]->first << std::endl;
+	deckStream << "#extra" << std::endl;
+	for(size_t i = 0; i < deck.extra.size(); ++i)
+		deckStream << deck.extra[i]->first << std::endl;
+	deckStream << "!side" << std::endl;
+	for(size_t i = 0; i < deck.side.size(); ++i)
+		deckStream << deck.side[i]->first << std::endl;
+}
 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");
 	if(!fp)
 		return false;
-	std::fprintf(fp, "#created by ...\n#main\n");
-	for(size_t i = 0; i < deck.main.size(); ++i)
-		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, "%u\n", deck.extra[i]->first);
-	std::fprintf(fp, "!side\n");
-	for(size_t i = 0; i < deck.side.size(); ++i)
-		std::fprintf(fp, "%u\n", deck.side[i]->first);
+	std::stringstream deckStream;
+	SaveDeck(deck, deckStream);
+	std::fwrite(deckStream.str().c_str(), 1, deckStream.str().length(), fp);
 	std::fclose(fp);
 	return true;
 }