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

gframe/client_field.cpp

@@ -633,10 +633,9 @@ void ClientField::ReplaySwap() {
 	}
 	mainGame->dInfo.isFirst = !mainGame->dInfo.isFirst;
 	std::swap(mainGame->dInfo.lp[0], mainGame->dInfo.lp[1]);
-	for(int i = 0; i < 16; ++i)
-		std::swap(mainGame->dInfo.strLP[0][i], mainGame->dInfo.strLP[1][i]);
-	for(int i = 0; i < 20; ++i)
-		std::swap(mainGame->dInfo.hostname[i], mainGame->dInfo.clientname[i]);
+	std::swap(mainGame->dInfo.strLP[0], mainGame->dInfo.strLP[1]);
+	std::swap(mainGame->dInfo.hostname, mainGame->dInfo.clientname);
+	std::swap(mainGame->dInfo.hostname_tag, mainGame->dInfo.clientname_tag);
 	for(auto chit = chains.begin(); chit != chains.end(); ++chit) {
 		chit->controler = 1 - chit->controler;
 		GetChainLocation(chit->controler, chit->location, chit->sequence, &chit->chain_pos);

gframe/duelclient.cpp

@@ -1026,6 +1026,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		ClientCard* pcard;
 		mainGame->dField.activatable_cards.clear();
 		mainGame->dField.activatable_descs.clear();
+		mainGame->dField.conti_cards.clear();
 		count = BufferIO::ReadInt8(pbuf);
 		for (int i = 0; i < count; ++i) {
 			code = BufferIO::ReadInt32(pbuf);
@@ -1155,6 +1156,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		}
 		mainGame->dField.activatable_cards.clear();
 		mainGame->dField.activatable_descs.clear();
+		mainGame->dField.conti_cards.clear();
 		count = BufferIO::ReadInt8(pbuf);
 		for (int i = 0; i < count; ++i) {
 			code = BufferIO::ReadInt32(pbuf);

gframe/replay_mode.h

@@ -33,6 +33,8 @@ public:
 	static void Pause(bool is_pause, bool is_step);
 	static bool ReadReplayResponse();
 	static int ReplayThread(void* param);
+	static bool StartDuel();
+	static void EndDuel();
 	static void Restart(bool refresh);
 	static void Undo();
 	static bool ReplayAnalyze(char* msg, unsigned int len);

gframe/single_duel.cpp

@@ -1720,8 +1720,10 @@ void SingleDuel::RefreshMzone(int player, int flag, int use_cache) {
 #ifdef YGOPRO_SERVER_MODE
 	NetServer::ReSendToPlayer(replay_recorder);
 #endif
-	for (int i = 0; i < 5; ++i) {
+	int qlen = 0;
+	while(qlen < len) {
 		int clen = BufferIO::ReadInt32(qbuf);
+		qlen += clen;
 		if (clen == 4)
 			continue;
 		if (qbuf[11] & POS_FACEDOWN)
@@ -1746,8 +1748,10 @@ void SingleDuel::RefreshSzone(int player, int flag, int use_cache) {
 #ifdef YGOPRO_SERVER_MODE
 	NetServer::ReSendToPlayer(replay_recorder);
 #endif
-	for (int i = 0; i < 8; ++i) {
+	int qlen = 0;
+	while(qlen < len) {
 		int clen = BufferIO::ReadInt32(qbuf);
+		qlen += clen;
 		if (clen == 4)
 			continue;
 		if (qbuf[11] & POS_FACEDOWN)
@@ -1772,9 +1776,9 @@ void SingleDuel::RefreshHand(int player, int flag, int use_cache) {
 #ifdef YGOPRO_SERVER_MODE
 	NetServer::ReSendToPlayer(replay_recorder);
 #endif
-	int qlen = 0, slen;
+	int qlen = 0;
 	while(qlen < len) {
-		slen = BufferIO::ReadInt32(qbuf);
+		int slen = BufferIO::ReadInt32(qbuf);
 		int qflag = *(int*)qbuf;
 		int pos = slen - 8;
 		if(qflag & QUERY_LSCALE)

gframe/tag_duel.cpp

@@ -1780,8 +1780,10 @@ void TagDuel::RefreshMzone(int player, int flag, int use_cache) {
 #ifdef YGOPRO_SERVER_MODE
 	NetServer::ReSendToPlayer(replay_recorder);
 #endif
-	for (int i = 0; i < 5; ++i) {
+	int qlen = 0;
+	while(qlen < len) {
 		int clen = BufferIO::ReadInt32(qbuf);
+		qlen += clen;
 		if (clen == 4)
 			continue;
 		if (qbuf[11] & POS_FACEDOWN)
@@ -1810,8 +1812,10 @@ void TagDuel::RefreshSzone(int player, int flag, int use_cache) {
 #ifdef YGOPRO_SERVER_MODE
 	NetServer::ReSendToPlayer(replay_recorder);
 #endif
-	for (int i = 0; i < 8; ++i) {
+	int qlen = 0;
+	while(qlen < len) {
 		int clen = BufferIO::ReadInt32(qbuf);
+		qlen += clen;
 		if (clen == 4)
 			continue;
 		if (qbuf[11] & POS_FACEDOWN)
@@ -1838,9 +1842,9 @@ void TagDuel::RefreshHand(int player, int flag, int use_cache) {
 #ifdef YGOPRO_SERVER_MODE
 	NetServer::ReSendToPlayer(replay_recorder);
 #endif
-	int qlen = 0, slen;
+	int qlen = 0;
 	while(qlen < len) {
-		slen = BufferIO::ReadInt32(qbuf);
+		int slen = BufferIO::ReadInt32(qbuf);
 		int qflag = *(int*)qbuf;
 		int pos = slen - 8;
 		if(qflag & QUERY_LSCALE)

ocgcore @ 2cb77212

-Subproject commit 745ef5f647a3a41bc04ef704099303b221e14e39
+Subproject commit 2cb77212b7399a9c8a0368cafe89744160dae812

script @ 0da96933

-Subproject commit ef47b28ebdcecb27007e749f7275febf92bd71f2
+Subproject commit 0da9693357cd309e5539f853566b1ba3921866e0