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

gframe/bufferio.h

@@ -27,8 +27,9 @@ public:
 	inline static void WriteInt8(unsigned char*& p, char val) {
 		buffer_write<char>(p, val);
 	}
+	// return: string length
 	template<typename T1, typename T2>
-	inline static int CopyWStr(T1* src, T2* pstr, int bufsize) {
+	inline static int CopyWStr(const T1* src, T2* pstr, int bufsize) {
 		int l = 0;
 		while(src[l] && l < bufsize - 1) {
 			pstr[l] = (T2)src[l];
@@ -38,7 +39,7 @@ public:
 		return l;
 	}
 	template<typename T1, typename T2>
-	inline static int CopyWStrRef(T1* src, T2*& pstr, int bufsize) {
+	inline static int CopyWStrRef(const T1* src, T2*& pstr, int bufsize) {
 		int l = 0;
 		while(src[l] && l < bufsize - 1) {
 			pstr[l] = (T2)src[l];
@@ -49,8 +50,8 @@ public:
 		return l;
 	}
 	// UTF-16/UTF-32 to UTF-8
-	template<size_t N>
-	static int EncodeUTF8(const wchar_t* wsrc, char(&str)[N]) {
+	// return: string length
+	static int EncodeUTF8String(const wchar_t* wsrc, char* str, int size) {
 		char* pstr = str;
 		while (*wsrc != 0) {
 			unsigned cur = *wsrc;
@@ -63,7 +64,7 @@ public:
 				codepoint_size = 3;
 			else
 				codepoint_size = 4;
-			if (pstr - str + codepoint_size > N - 1)
+			if (pstr - str + codepoint_size > size - 1)
 				break;
 			switch (codepoint_size) {
 			case 1:
@@ -101,8 +102,8 @@ public:
 		return pstr - str;
 	}
 	// UTF-8 to UTF-16/UTF-32
-	template<size_t N>
-	static int DecodeUTF8(const char* src, wchar_t(&wstr)[N]) {
+	// return: string length
+	static int DecodeUTF8String(const char* src, wchar_t* wstr, int size) {
 		const char* p = src;
 		wchar_t* wp = wstr;
 		while(*p != 0) {
@@ -116,7 +117,7 @@ public:
 			}
 			else
 				codepoint_size = 1;
-			if (wp - wstr + codepoint_size > N - 1)
+			if (wp - wstr + codepoint_size > size - 1)
 				break;
 			if((cur & 0x80) == 0) {
 				*wp = *p;
@@ -144,6 +145,18 @@ public:
 		*wp = 0;
 		return wp - wstr;
 	}
+	template<size_t N>
+	static int EncodeUTF8(const wchar_t* src, char(&dst)[N]) {
+		return EncodeUTF8String(src, dst, N);
+	}
+	template<size_t N>
+	static int DecodeUTF8(const char* src, wchar_t(&dst)[N]) {
+		return DecodeUTF8String(src, dst, N);
+	}
+	template<size_t N, typename T>
+	static void NullTerminate(T(&str)[N]) {
+		str[N - 1] = 0;
+	}
 	static int GetVal(const wchar_t* pstr) {
 		unsigned int ret = 0;
 		while(*pstr >= L'0' && *pstr <= L'9') {

gframe/deck_con.cpp

@@ -1757,7 +1757,7 @@ bool DeckBuilder::push_main(code_pointer pointer, int seq) {
 	if(pointer->second.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK))
 		return false;
 	auto& container = deckManager.current_deck.main;
-	int maxc = mainGame->is_siding ? DECK_MAX_SIZE + 4 : DECK_MAX_SIZE;
+	int maxc = mainGame->is_siding ? DECK_MAX_SIZE + 5 : DECK_MAX_SIZE;
 	if((int)container.size() >= maxc)
 		return false;
 	if(seq >= 0 && seq < (int)container.size())

gframe/deck_manager.cpp

@@ -35,7 +35,7 @@ void DeckManager::LoadLFListSingle(const char* path) {
 			int count = -1;
 			if (sscanf(linebuf, "%d %d", &code, &count) != 2)
 				continue;
-			if (code <= 0 || code > 99999999)
+			if (code <= 0 || code > 0xfffffff)
 				continue;
 			if (count < 0 || count > 2)
 				continue;
@@ -173,7 +173,7 @@ int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_p
 		}
 		if(cd.type & TYPE_TOKEN)
 			continue;
-		if(deck.side.size() < 15)
+		if(deck.side.size() < SIDE_MAX_SIZE)
 			deck.side.push_back(dataManager.GetCodePointer(code));
 	}
 	return errorcode;

gframe/duelclient.cpp

@@ -823,10 +823,11 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, int len) {
 		soundManager.PlaySoundEffect(SOUND_PLAYER_ENTER);
 		STOC_HS_PlayerEnter packet;
 		std::memcpy(&packet, pdata, STOC_HS_PlayerEnter_size);
-		const auto* pkt = &packet;
+		auto pkt = &packet;
 		if(pkt->pos > 3)
 			break;
 		wchar_t name[20];
+		BufferIO::NullTerminate(pkt->name);
 		BufferIO::CopyWStr(pkt->name, name, 20);
 		if(mainGame->dInfo.isTag) {
 			if(pkt->pos == 0)
@@ -1515,7 +1516,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
 			wchar_t ynbuf[256];
 			myswprintf(ynbuf, dataManager.GetSysString(221), dataManager.FormatLocation(l, s), dataManager.GetName(code));
 			myswprintf(textBuffer, L"%ls\n%ls\n%ls", event_string, ynbuf, dataManager.GetSysString(223));
-		} else if(desc < 2048) {
+		} else if(desc <= MAX_STRING_ID) {
 			myswprintf(textBuffer, dataManager.GetSysString(desc), dataManager.GetName(code));
 		} else {
 			myswprintf(textBuffer, dataManager.GetDesc(desc), dataManager.GetName(code));

gframe/game.cpp

@@ -10,7 +10,7 @@
 #include "netserver.h"
 #include "single_mode.h"
 
-const unsigned short PRO_VERSION = 0x1360;
+const unsigned short PRO_VERSION = 0x1361;
 
 namespace ygo {
 

gframe/netserver.cpp

@@ -249,7 +249,8 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) {
 			return;
 		CTOS_PlayerInfo packet;
 		std::memcpy(&packet, pdata, sizeof packet);
-		const auto* pkt = &packet;
+		auto pkt = &packet;
+		BufferIO::NullTerminate(pkt->name);
 		BufferIO::CopyWStr(pkt->name, dp->name, 20);
 		break;
 	}
@@ -271,10 +272,10 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) {
 			duel_mode = new TagDuel();
 			duel_mode->etimer = event_new(net_evbase, 0, EV_TIMEOUT | EV_PERSIST, TagDuel::TagTimer, duel_mode);
 		}
-		if(pkt->info.rule > 5)
-			pkt->info.rule = 5;
-		if(pkt->info.mode > 2)
-			pkt->info.mode = 0;
+		if(pkt->info.rule > CURRENT_RULE)
+			pkt->info.rule = CURRENT_RULE;
+		if(pkt->info.mode > MODE_TAG)
+			pkt->info.mode = MODE_SINGLE;
 		unsigned int hash = 1;
 		for(auto lfit = deckManager._lfList.begin(); lfit != deckManager._lfList.end(); ++lfit) {
 			if(pkt->info.lflist == lfit->hash) {
@@ -286,6 +287,8 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) {
 			pkt->info.lflist = deckManager._lfList[0].hash;
 		std::memcpy(pdata, &packet, sizeof packet);
 		duel_mode->host_info = pkt->info;
+		BufferIO::NullTerminate(pkt->name);
+		BufferIO::NullTerminate(pkt->pass);
 		BufferIO::CopyWStr(pkt->name, duel_mode->name, 20);
 		BufferIO::CopyWStr(pkt->pass, duel_mode->pass, 20);
 		duel_mode->JoinGame(dp, 0, true);

gframe/network.h

@@ -10,7 +10,7 @@
 #include <event2/thread.h>
 #include <type_traits>
 
-#define check_trivially_copyable(T) static_assert(std::is_trivially_copyable<T>::value == true, "not trivially copyable")
+#define check_trivially_copyable(T) static_assert(std::is_trivially_copyable<T>::value == true && std::is_standard_layout<T>::value == true, "not trivially copyable")
 
 namespace ygo {
 	constexpr int SIZE_NETWORK_BUFFER = 0x2000;
@@ -113,6 +113,7 @@ struct STOC_HandResult {
 check_trivially_copyable(STOC_HandResult);
 static_assert(sizeof(STOC_HandResult) == 2, "size mismatch: STOC_HandResult");
 
+// reserved for STOC_CREATE_GAME
 struct STOC_CreateGame {
 	uint32_t gameid;
 };
@@ -131,6 +132,7 @@ struct STOC_TypeChange {
 check_trivially_copyable(STOC_TypeChange);
 static_assert(sizeof(STOC_TypeChange) == 1, "size mismatch: STOC_TypeChange");
 
+// reserved for STOC_LEAVE_GAME
 struct STOC_ExitGame {
 	unsigned char pos;
 };
@@ -250,46 +252,48 @@ public:
 #define NETPLAYER_TYPE_PLAYER6		5
 #define NETPLAYER_TYPE_OBSERVER		7
 
-#define CTOS_RESPONSE		0x1
-#define CTOS_UPDATE_DECK	0x2
-#define CTOS_HAND_RESULT	0x3
-#define CTOS_TP_RESULT		0x4
-#define CTOS_PLAYER_INFO	0x10
-#define CTOS_CREATE_GAME	0x11
-#define CTOS_JOIN_GAME		0x12
-#define CTOS_LEAVE_GAME		0x13
-#define CTOS_SURRENDER		0x14
-#define CTOS_TIME_CONFIRM	0x15
-#define CTOS_CHAT			0x16
-#define CTOS_HS_TODUELIST	0x20
-#define CTOS_HS_TOOBSERVER	0x21
-#define CTOS_HS_READY		0x22
-#define CTOS_HS_NOTREADY	0x23
-#define CTOS_HS_KICK		0x24
-#define CTOS_HS_START		0x25
-
-#define STOC_GAME_MSG		0x1
-#define STOC_ERROR_MSG		0x2
-#define STOC_SELECT_HAND	0x3
-#define STOC_SELECT_TP		0x4
-#define STOC_HAND_RESULT	0x5
-#define STOC_TP_RESULT		0x6
-#define STOC_CHANGE_SIDE	0x7
-#define STOC_WAITING_SIDE	0x8
-#define STOC_DECK_COUNT		0x9
-#define STOC_CREATE_GAME	0x11
-#define STOC_JOIN_GAME		0x12
-#define STOC_TYPE_CHANGE	0x13
-#define STOC_LEAVE_GAME		0x14
-#define STOC_DUEL_START		0x15
-#define STOC_DUEL_END		0x16
-#define STOC_REPLAY			0x17
-#define STOC_TIME_LIMIT		0x18
-#define STOC_CHAT			0x19
-#define STOC_HS_PLAYER_ENTER	0x20
-#define STOC_HS_PLAYER_CHANGE	0x21
-#define STOC_HS_WATCH_CHANGE	0x22
-#define STOC_TEAMMATE_SURRENDER	0x23
+#define CTOS_RESPONSE		0x1		// byte array
+#define CTOS_UPDATE_DECK	0x2		// int32_t array
+#define CTOS_HAND_RESULT	0x3		// CTOS_HandResult
+#define CTOS_TP_RESULT		0x4		// CTOS_TPResult
+#define CTOS_PLAYER_INFO	0x10	// CTOS_PlayerInfo
+#define CTOS_CREATE_GAME	0x11	// CTOS_CreateGame
+#define CTOS_JOIN_GAME		0x12	// CTOS_JoinGame
+#define CTOS_LEAVE_GAME		0x13	// no data
+#define CTOS_SURRENDER		0x14	// no data
+#define CTOS_TIME_CONFIRM	0x15	// no data
+#define CTOS_CHAT			0x16	// uint16_t array
+#define CTOS_HS_TODUELIST	0x20	// no data
+#define CTOS_HS_TOOBSERVER	0x21	// no data
+#define CTOS_HS_READY		0x22	// no data
+#define CTOS_HS_NOTREADY	0x23	// no data
+#define CTOS_HS_KICK		0x24	// CTOS_Kick
+#define CTOS_HS_START		0x25	// no data
+#define CTOS_REQUEST_FIELD	0x30
+
+#define STOC_GAME_MSG		0x1		// byte array
+#define STOC_ERROR_MSG		0x2		// STOC_ErrorMsg
+#define STOC_SELECT_HAND	0x3		// no data
+#define STOC_SELECT_TP		0x4		// no data
+#define STOC_HAND_RESULT	0x5		// STOC_HandResult
+#define STOC_TP_RESULT		0x6		// reserved
+#define STOC_CHANGE_SIDE	0x7		// no data
+#define STOC_WAITING_SIDE	0x8		// no data
+#define STOC_DECK_COUNT		0x9		// int16_t[6]
+#define STOC_CREATE_GAME	0x11	// reserved
+#define STOC_JOIN_GAME		0x12	// STOC_JoinGame
+#define STOC_TYPE_CHANGE	0x13	// STOC_TypeChange
+#define STOC_LEAVE_GAME		0x14	// reserved
+#define STOC_DUEL_START		0x15	// no data
+#define STOC_DUEL_END		0x16	// no data
+#define STOC_REPLAY			0x17	// ReplayHeader + byte array
+#define STOC_TIME_LIMIT		0x18	// STOC_TimeLimit
+#define STOC_CHAT			0x19	// uint16_t + uint16_t array
+#define STOC_HS_PLAYER_ENTER	0x20	// STOC_HS_PlayerEnter
+#define STOC_HS_PLAYER_CHANGE	0x21	// STOC_HS_PlayerChange
+#define STOC_HS_WATCH_CHANGE	0x22	// STOC_HS_WatchChange
+#define STOC_TEAMMATE_SURRENDER	0x23	// no data
+#define STOC_FIELD_FINISH		0x30
 
 #define PLAYERCHANGE_OBSERVE	0x8
 #define PLAYERCHANGE_READY		0x9

gframe/single_duel.cpp

@@ -34,7 +34,7 @@ void SingleDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater)
 		}
 		CTOS_JoinGame packet;
 		std::memcpy(&packet, pdata, sizeof packet);
-		const auto* pkt = &packet;
+		auto pkt = &packet;
 		if(pkt->version != PRO_VERSION) {
 			STOC_ErrorMsg scem;
 			scem.msg = ERRMSG_VERERROR;
@@ -44,6 +44,7 @@ void SingleDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater)
 			return;
 		}
 		wchar_t jpass[20];
+		BufferIO::NullTerminate(pkt->pass);
 		BufferIO::CopyWStr(pkt->pass, jpass, 20);
 		if(wcscmp(jpass, pass)) {
 			STOC_ErrorMsg scem;

gframe/tag_duel.cpp

@@ -38,7 +38,7 @@ void TagDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) {
 		}
 		CTOS_JoinGame packet;
 		std::memcpy(&packet, pdata, sizeof packet);
-		const auto* pkt = &packet;
+		auto pkt = &packet;
 		if(pkt->version != PRO_VERSION) {
 			STOC_ErrorMsg scem;
 			scem.msg = ERRMSG_VERERROR;
@@ -48,6 +48,7 @@ void TagDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) {
 			return;
 		}
 		wchar_t jpass[20];
+		BufferIO::NullTerminate(pkt->pass);
 		BufferIO::CopyWStr(pkt->pass, jpass, 20);
 		if(wcscmp(jpass, pass)) {
 			STOC_ErrorMsg scem;

ocgcore @ 3d4f2ed9

-Subproject commit 74520eb0c3980f3eb3b49147d11c402af4b28ae7
+Subproject commit 3d4f2ed9db4c92fddbfe3e41608328d1d0a73397

script @ 2669feb6

-Subproject commit c5271c21b3bdd1789e29fc09e83af44c8ff537bb
+Subproject commit 2669feb62f4bfd05f43d787f8491c309a243f88d

strings.conf

@@ -139,6 +139,7 @@
 !system 572 请选择要放置指示物的卡
 !system 573 请选择要无效的卡
 !system 574 请选择要操作的卡
+!system 575 请选择场上的卡（按取消可选择其他区域的卡）
 !system 1000 卡组
 !system 1001 手卡
 !system 1002 怪兽区
@@ -1221,3 +1222,5 @@
 !setname 0x1b1 白森林	白き森
 !setname 0x1b2 欢聚友伴	マルチャミー
 !setname 0x1b3 徽记	エンブレーマ
+!setname 0x1b4 时空	タキオン
+!setname 0x1b5 蓝泪	青い涙