Merge branch 'patch-remove-ready' of ../versions/ygopro-mc into server-develop

gframe/menu_handler.cpp

@@ -165,7 +165,6 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					break;
 				}
 				UpdateDeck();
-				DuelClient::SendPacketToServer(CTOS_HS_READY);
 				mainGame->cbCategorySelect->setEnabled(false);
 				mainGame->cbDeckSelect->setEnabled(false);
 				break;
@@ -615,7 +614,6 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 						break;
 					}
 					UpdateDeck();
-					DuelClient::SendPacketToServer(CTOS_HS_READY);
 					mainGame->cbCategorySelect->setEnabled(false);
 					mainGame->cbDeckSelect->setEnabled(false);
 				} else {

gframe/netserver.cpp

@@ -437,11 +437,10 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) {
 		duel_mode->ToObserver(dp);
 		break;
 	}
-	case CTOS_HS_READY:
 	case CTOS_HS_NOTREADY: {
 		if (!duel_mode || duel_mode->pduel)
 			return;
-		duel_mode->PlayerReady(dp, (CTOS_HS_NOTREADY - pktType) != 0);
+		duel_mode->PlayerReady(dp, false);
 		break;
 	}
 	case CTOS_HS_KICK: {

gframe/network.h

@@ -276,7 +276,7 @@ public:
 #define CTOS_EXTERNAL_ADDRESS	0x17	// CTOS_ExternalAddress
 #define CTOS_HS_TODUELIST	0x20	// no data
 #define CTOS_HS_TOOBSERVER	0x21	// no data
-#define CTOS_HS_READY		0x22	// 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

gframe/single_duel.cpp

@@ -408,6 +408,11 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
 #endif
 		valid = false;
 	if (!valid) {
+		if(duel_count == 0) {
+			STOC_HS_PlayerChange scpc;
+			scpc.status = (dp->type << 4) | PLAYERCHANGE_NOTREADY;
+			NetServer::SendPacketToPlayer(dp, STOC_HS_PLAYER_CHANGE, scpc);
+		}
 		STOC_ErrorMsg scem;
 		scem.msg = ERRMSG_DECKERROR;
 		scem.code = 0;
@@ -416,6 +421,7 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
 	}
 	if(duel_count == 0) {
 		deck_error[dp->type] = DeckManager::LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec);
+		PlayerReady(dp, true);
 	} else {
 		if(DeckManager::LoadSide(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec)) {
 			ready[dp->type] = true;

gframe/tag_duel.cpp

@@ -394,6 +394,9 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
 #endif
 		valid = false;
 	if (!valid) {
+		STOC_HS_PlayerChange scpc;
+		scpc.status = (dp->type << 4) | PLAYERCHANGE_NOTREADY;
+		NetServer::SendPacketToPlayer(dp, STOC_HS_PLAYER_CHANGE, scpc);
 		STOC_ErrorMsg scem;
 		scem.msg = ERRMSG_DECKERROR;
 		scem.code = 0;
@@ -401,6 +404,7 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
 		return;
 	}
 	deck_error[dp->type] = DeckManager::LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec);
+	PlayerReady(dp, true);
 }
 void TagDuel::StartDuel(DuelPlayer* dp) {
 	if(dp != host_player)