Merge branch 'upstream' into patch-genesys

Author: salix5

.github/workflows/build.yml

@@ -13,15 +13,14 @@
 /WindBot
 /cards.cdb
 /error.log
+/system.conf
 /bot.conf
 /Bot.exe
 /bot
 
 /ygopro
 /ygopro.exe
 /ygopro.app
-/ikpMP3.dll
-/irrKlang.dll
 
 /.vscode/
 /bin/
@@ -31,11 +30,11 @@
 /freetype
 /irrlicht
 /jpeg
-/irrklang
-/ikpmp3
 /lua
 /miniaudio
+/png
 /sqlite3
+/zlib
 /gframe/*.ico
 /gframe/ygopro.rc
 /gframe/ygopro.aps

.gitignore

@@ -77,7 +77,7 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide
 
 		// Load the monochrome data in.
 		const u32 image_pitch = image->getPitch() / sizeof(u16);
-		u16* image_data = (u16*)image->lock();
+		u16* image_data = (u16*)image->getData();
 		u8* glyph_data = bits.buffer;
 		for (s32 y = 0; y < (s32)bits.rows; ++y) {
 			u16* row = image_data;
@@ -102,7 +102,7 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide
 		// Load the grayscale data in.
 		const float gray_count = static_cast<float>(bits.num_grays);
 		const u32 image_pitch = image->getPitch() / sizeof(u32);
-		u32* image_data = (u32*)image->lock();
+		u32* image_data = (u32*)image->getData();
 		u8* glyph_data = bits.buffer;
 		for (s32 y = 0; y < (s32)bits.rows; ++y) {
 			u8* row = glyph_data;

gframe/CGUITTFont.cpp

@@ -77,6 +77,7 @@ class BufferIO {
 		return l;
 	}
 	template<typename T1, typename T2>
+	[[deprecated]]
 	static int CopyWStrRef(const T1* src, T2*& pstr, int bufsize) {
 		int l = 0;
 		while(src[l] && l < bufsize - 1) {
@@ -122,27 +123,25 @@ class BufferIO {
 	}
 	// UTF-16/UTF-32 to UTF-8
 	// return: string length
-	static int EncodeUTF8String(const wchar_t* wsrc, char* str, size_t len) {
-		if (len == 0) {
-			str[0] = 0;
+	static int EncodeUTF8String(const wchar_t* wsrc, char* str, size_t size) {
+		if (size == 0) {
 			return 0;
 		}
 		std::mbstate_t state{};
-		size_t result_len = std::wcsrtombs(str, &wsrc, len - 1, &state);
+		size_t result_len = std::wcsrtombs(str, &wsrc, size - 1, &state);
 		if (result_len == static_cast<size_t>(-1))
 			result_len = 0;
 		str[result_len] = 0;
 		return static_cast<int>(result_len);
 	}
 	// UTF-8 to UTF-16/UTF-32
 	// return: string length
-	static int DecodeUTF8String(const char* src, wchar_t* wstr, size_t len) {
-		if (len == 0) {
-			wstr[0] = 0;
+	static int DecodeUTF8String(const char* src, wchar_t* wstr, size_t size) {
+		if (size == 0) {
 			return 0;
 		}
 		std::mbstate_t state{};
-		size_t result_len = std::mbsrtowcs(wstr, &src, len - 1, &state);
+		size_t result_len = std::mbsrtowcs(wstr, &src, size - 1, &state);
 		if (result_len == static_cast<size_t>(-1))
 			result_len = 0;
 		wstr[result_len] = 0;

gframe/bufferio.h

@@ -141,6 +141,16 @@ void ClientCard::UpdateInfo(unsigned char* buf) {
 	if(flag & QUERY_OVERLAY_CARD) {
 		int count = BufferIO::Read<int32_t>(buf);
 		for(int i = 0; i < count; ++i) {
+			if(i >= overlayed.size()) {
+				ClientCard* xcard = new ClientCard;
+				overlayed.push_back(xcard);
+				mainGame->dField.overlay_cards.insert(xcard);
+				xcard->overlayTarget = this;
+				xcard->location = LOCATION_OVERLAY;
+				xcard->sequence = (unsigned char)(overlayed.size() - 1);
+				xcard->owner = controler; // not accurate
+				xcard->controler = controler;
+			}
 			overlayed[i]->SetCode(BufferIO::Read<int32_t>(buf));
 		}
 	}

gframe/client_card.cpp

@@ -1050,7 +1050,7 @@ void ClientField::GetCardLocation(ClientCard* pcard, irr::core::vector3df* t, ir
 			return;
 		}
 		int oseq = pcard->overlayTarget->sequence;
-		int mseq = (sequence < MAX_LAYER_COUNT) ? sequence : (MAX_LAYER_COUNT - 1);
+		int mseq = myclamp(sequence, 0, MAX_LAYER_COUNT - 1);
 		if (pcard->overlayTarget->controler == 0) {
 			t->X = (matManager.vFieldMzone[0][oseq][0].Pos.X + matManager.vFieldMzone[0][oseq][1].Pos.X) / 2 - 0.12f + 0.06f * mseq;
 			t->Y = (matManager.vFieldMzone[0][oseq][0].Pos.Y + matManager.vFieldMzone[0][oseq][2].Pos.Y) / 2 + 0.05f;
@@ -1175,7 +1175,7 @@ bool ClientField::CheckSelectSum() {
 		int op1 = selected_cards[i]->opParam & 0xffff;
 		int op2 = selected_cards[i]->opParam >> 16;
 		int opmin = (op2 > 0 && op1 > op2) ? op2 : op1;
-		int opmax = op2 > op1 ? op2 : op1;
+		int opmax = std::max(op1, op2);
 		select_curval_l += opmin;
 		select_curval_h += opmax;
 	}
@@ -1198,7 +1198,7 @@ bool ClientField::CheckSelectSum() {
 			int op1, op2;
 			get_sum_params(sc->opParam, op1, op2);
 			int opmin = (op2 > 0 && op1 > op2) ? op2 : op1;
-			int opmax = op2 > op1 ? op2 : op1;
+			int opmax = std::max(op1, op2);
 			if (mm == -1 || opmin < mm)
 				mm = opmin;
 			if (mx == -1 || opmax < mx)

gframe/client_field.cpp

@@ -57,6 +57,10 @@ template<size_t N, typename... TR>
 inline int mysnprintf(char(&buf)[N], const char* fmt, TR... args) {
 	return std::snprintf(buf, N, fmt, args...);
 }
+template<typename T>
+inline T myclamp(T v, T lo, T hi) {
+	return (v < lo) ? lo : (hi < v) ? hi : v;
+}
 
 inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
 	FILE* fp{};

gframe/config.h

@@ -176,27 +176,30 @@ bool DataManager::LoadStrings(irr::io::IReadFile* reader) {
 			linebuf.clear();
 		}
 	}
+	if (!linebuf.empty()) {
+		ReadStringConfLine(linebuf.data());
+	}
 	reader->drop();
 	return true;
 }
 void DataManager::ReadStringConfLine(const char* linebuf) {
 	if(linebuf[0] != '!')
 		return;
 	char strbuf[TEXT_LINE_SIZE]{};
-	int value{};
+	uint32_t value{};
 	wchar_t strBuffer[4096]{};
 	if (std::sscanf(linebuf, "!%63s", strbuf) != 1)
 		return;
 	if(!std::strcmp(strbuf, "system")) {
-		if (std::sscanf(&linebuf[7], "%d %240[^\n]", &value, strbuf) != 2)
+		if (std::sscanf(&linebuf[7], "%u %240[^\n]", &value, strbuf) != 2)
 			return;
 		BufferIO::DecodeUTF8(strbuf, strBuffer);
-		_sysStrings[value] = strBuffer;
+		_sysStrings.emplace(value, strBuffer);
 	} else if(!std::strcmp(strbuf, "victory")) {
 		if (std::sscanf(&linebuf[8], "%x %240[^\n]", &value, strbuf) != 2)
 			return;
 		BufferIO::DecodeUTF8(strbuf, strBuffer);
-		_victoryStrings[value] = strBuffer;
+		_victoryStrings.emplace(value, strBuffer);
 	} else if(!std::strcmp(strbuf, "counter")) {
 		if (std::sscanf(&linebuf[8], "%x %240[^\n]", &value, strbuf) != 2)
 			return;
@@ -260,7 +263,7 @@ const wchar_t* DataManager::GetText(uint32_t code) const {
 	return unknown_string;
 }
 const wchar_t* DataManager::GetDesc(uint32_t strCode) const {
-	if (strCode < (MIN_CARD_ID << 4))
+	if (strCode <= MAX_STRING_ID)
 		return GetSysString(strCode);
 	unsigned int code = (strCode >> 4) & 0x0fffffff;
 	unsigned int offset = strCode & 0xf;

gframe/data_manager.cpp

@@ -3,10 +3,11 @@
 
 #include <vector>
 #include <cstdint>
-#include "data_manager.h"
 
 namespace ygo {
 
+struct CardDataC;
+
 struct Deck {
 	std::vector<const CardDataC*> main;
 	std::vector<const CardDataC*> extra;

gframe/deck.h

@@ -2,6 +2,8 @@
 #include <array>
 #include "config.h"
 #include "deck_con.h"
+#include "data_manager.h"
+#include "deck_manager.h"
 #include "myfilesystem.h"
 #include "image_manager.h"
 #include "sound_manager.h"
@@ -1746,10 +1748,7 @@ void DeckBuilder::ShowBigCard(int code, float zoom) {
 	mainGame->gMutex.unlock();
 }
 void DeckBuilder::ZoomBigCard(irr::s32 centerx, irr::s32 centery) {
-	if(bigcard_zoom >= 4)
-		bigcard_zoom = 4;
-	if(bigcard_zoom <= 0.2f)
-		bigcard_zoom = 0.2f;
+	bigcard_zoom = myclamp(bigcard_zoom, 0.2f, 4.0f);
 	auto img = imageManager.GetBigPicture(bigcard_code, bigcard_zoom);
 	mainGame->imgBigCard->setImage(img);
 	auto size = img->getSize();