Merge branch 'master' into server

gframe/game.cpp

@@ -286,7 +286,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Crystal", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Moon", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

gframe/replay_mode.cpp

@@ -337,6 +337,13 @@ bool ReplayMode::ReplayAnalyze(unsigned char* msg, unsigned int len) {
 			pbuf += 3;
 			break;
 		}
+		case MSG_UPDATE_CARD: {
+			pbuf += 3;
+			const int clen = BufferIO::ReadInt32(pbuf);
+			pbuf += (clen - 4);
+			DuelClient::ClientAnalyze(offset, pbuf - offset);
+			break;
+		}
 		case MSG_RETRY: {
 			if(mainGame->dInfo.isReplaySkiping) {
 				mainGame->dInfo.isReplaySkiping = false;

gframe/single_duel.cpp

@@ -768,6 +768,16 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
 			}
 			break;			
 		}
+		case MSG_UPDATE_CARD: {
+			auto controller = BufferIO::ReadUInt8(pbuf);
+			auto location = BufferIO::ReadUInt8(pbuf);
+			auto sequence = BufferIO::ReadUInt8(pbuf);
+			auto clen = BufferIO::ReadInt32(pbuf);
+			auto query_flag = BufferIO::ReadUInt32(pbuf);
+			pbuf += (clen - 8);
+			RefreshSingle(controller, location, sequence, query_flag);
+			break;
+		}
 		case MSG_RETRY: {
 			WaitforResponse(last_response);
 			NetServer::SendBufferToPlayer(players[last_response], STOC_GAME_MSG, offset, pbuf - offset);

gframe/single_mode.cpp

@@ -194,6 +194,13 @@ bool SingleMode::SinglePlayAnalyze(unsigned char* msg, unsigned int len) {
 			pbuf += 3;
 			break;
 		}
+		case MSG_UPDATE_CARD: {
+			pbuf += 3;
+			const int clen = BufferIO::ReadInt32(pbuf);
+			pbuf += (clen - 4);
+			DuelClient::ClientAnalyze(offset, pbuf - offset);
+			break;
+		}
 		case MSG_RETRY: {
 			if(!DuelClient::ClientAnalyze(offset, pbuf - offset)) {
 				mainGame->singleSignal.Reset();

gframe/tag_duel.cpp

@@ -724,6 +724,16 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
 			}
 			break;			
 		}
+		case MSG_UPDATE_CARD: {
+			auto controller = BufferIO::ReadUInt8(pbuf);
+			auto location = BufferIO::ReadUInt8(pbuf);
+			auto sequence = BufferIO::ReadUInt8(pbuf);
+			auto clen = BufferIO::ReadInt32(pbuf);
+			auto query_flag = BufferIO::ReadUInt32(pbuf);
+			pbuf += (clen - 8);
+			RefreshSingle(controller, location, sequence, query_flag);
+			break;
+		}
 		case MSG_RETRY: {
 			WaitforResponse(last_response);
 			NetServer::SendBufferToPlayer(cur_player[last_response], STOC_GAME_MSG, offset, pbuf - offset);

ocgcore @ 00e330d8

-Subproject commit 2a688aeb72bced1dffa60db1e3c802041f8c59e2
+Subproject commit 00e330d80aac73768664956f477a1b13d1d78a81

script @ ab24c9c7

-Subproject commit 3c12554320ef1a2d867fcc6b6b7e6e5d5237a7ae
+Subproject commit ab24c9c72fe789c67aaf2fa87629eb8cfe4170cd