shuffle

gframe/event_handler.cpp

@@ -250,6 +250,12 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				mainGame->HideElement(mainGame->wANCard, true);
 				break;
 			}
+			case BUTTON_CMD_SHUFFLE: {
+				mainGame->wCmdMenu->setVisible(false);
+				DuelClient::SetResponseI(8);
+				DuelClient::SendResponse();
+				break;
+			}
 			case BUTTON_CMD_ACTIVATE: {
 				mainGame->wCmdMenu->setVisible(false);
 				if(!list_command) {
@@ -984,17 +990,17 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					break;
 				}
 				case LOCATION_HAND: {
-										if (!clicked_card)
-											break;
-										int command_flag = clicked_card->cmdFlag;
-										if (clicked_card->overlayed.size())
-											command_flag |= COMMAND_LIST;
-										list_command = 0;
-										if (hovered_location & LOCATION_HAND && mainGame->canShuffle
-											&& mainGame->dInfo.curMsg == MSG_SELECT_IDLECMD)
-											command_flag |= COMMAND_SHUFFLE;
-										ShowMenu(command_flag, x, y);
-										break;
+					if (!clicked_card)
+						break;
+					int command_flag = clicked_card->cmdFlag;
+					if (clicked_card->overlayed.size())
+						command_flag |= COMMAND_LIST;
+					list_command = 0;
+					if (hovered_location & LOCATION_HAND && mainGame->canShuffle
+						&& mainGame->dInfo.curMsg == MSG_SELECT_IDLECMD)
+						command_flag |= COMMAND_SHUFFLE;
+					ShowMenu(command_flag, x, y);
+					break;
 				}
 				case LOCATION_MZONE:
 				case LOCATION_SZONE: {

gframe/game.h

@@ -428,6 +428,7 @@ extern Game* mainGame;
 #define BUTTON_CMD_REPOS			245
 #define BUTTON_CMD_ATTACK			246
 #define BUTTON_CMD_SHOWLIST			247
+#define BUTTON_CMD_SHUFFLE			248
 #define BUTTON_ANNUMBER_OK			250
 #define BUTTON_ANCARD_OK			251
 #define EDITBOX_ANCARD				252

gframe/replay_mode.cpp

@@ -250,7 +250,7 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
 			count = BufferIO::ReadInt8(pbuf);
 			pbuf += count * 7;
 			count = BufferIO::ReadInt8(pbuf);
-			pbuf += count * 11 + 2;
+			pbuf += count * 11 + 3;
 			ReplayRefresh();
 			return ReadReplayResponse();
 		}

gframe/single_duel.cpp

@@ -637,7 +637,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
 			count = BufferIO::ReadInt8(pbuf);
 			pbuf += count * 7;
 			count = BufferIO::ReadInt8(pbuf);
-			pbuf += count * 11 + 2;
+			pbuf += count * 11 + 3;
 			RefreshMzone(0);
 			RefreshMzone(1);
 			RefreshSzone(0);

gframe/single_mode.cpp

@@ -161,7 +161,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
 			count = BufferIO::ReadInt8(pbuf);
 			pbuf += count * 7;
 			count = BufferIO::ReadInt8(pbuf);
-			pbuf += count * 11 + 2;
+			pbuf += count * 11 + 3;
 			SinglePlayRefresh();
 			if(!DuelClient::ClientAnalyze(offset, pbuf - offset)) {
 				mainGame->singleSignal.Reset();

gframe/tag_duel.cpp

@@ -570,7 +570,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
 			count = BufferIO::ReadInt8(pbuf);
 			pbuf += count * 7;
 			count = BufferIO::ReadInt8(pbuf);
-			pbuf += count * 11 + 2;
+			pbuf += count * 11 + 3;
 			RefreshMzone(0);
 			RefreshMzone(1);
 			RefreshSzone(0);