Commit 339c26c7 authored by mercury233's avatar mercury233

update MSG_CONFIRM_CARDS, add skip_panel

parent d63e5177
...@@ -2079,6 +2079,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -2079,6 +2079,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
} }
case MSG_CONFIRM_CARDS: { case MSG_CONFIRM_CARDS: {
/*int player = */mainGame->LocalPlayer(BufferIO::ReadInt8(pbuf)); /*int player = */mainGame->LocalPlayer(BufferIO::ReadInt8(pbuf));
int skip_panel = BufferIO::ReadInt8(pbuf);
int count = BufferIO::ReadInt8(pbuf); int count = BufferIO::ReadInt8(pbuf);
int code, c, l, s; int code, c, l, s;
std::vector<ClientCard*> field_confirm; std::vector<ClientCard*> field_confirm;
...@@ -2164,7 +2165,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -2164,7 +2165,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
} }
mainGame->WaitFrameSignal(5); mainGame->WaitFrameSignal(5);
} }
if (panel_confirm.size()) { if (!skip_panel && panel_confirm.size()) {
std::sort(panel_confirm.begin(), panel_confirm.end(), ClientCard::client_card_sort); std::sort(panel_confirm.begin(), panel_confirm.end(), ClientCard::client_card_sort);
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->dField.selectable_cards = panel_confirm; mainGame->dField.selectable_cards = panel_confirm;
......
...@@ -460,6 +460,7 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) { ...@@ -460,6 +460,7 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
} }
case MSG_CONFIRM_CARDS: { case MSG_CONFIRM_CARDS: {
player = BufferIO::ReadInt8(pbuf); player = BufferIO::ReadInt8(pbuf);
pbuf += 1;
count = BufferIO::ReadInt8(pbuf); count = BufferIO::ReadInt8(pbuf);
pbuf += count * 7; pbuf += count * 7;
DuelClient::ClientAnalyze(offset, pbuf - offset); DuelClient::ClientAnalyze(offset, pbuf - offset);
......
...@@ -822,6 +822,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -822,6 +822,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
} }
case MSG_CONFIRM_CARDS: { case MSG_CONFIRM_CARDS: {
player = BufferIO::ReadInt8(pbuf); player = BufferIO::ReadInt8(pbuf);
pbuf += 1;
count = BufferIO::ReadInt8(pbuf); count = BufferIO::ReadInt8(pbuf);
if(pbuf[5] != LOCATION_DECK) { if(pbuf[5] != LOCATION_DECK) {
pbuf += count * 7; pbuf += count * 7;
......
...@@ -369,6 +369,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) { ...@@ -369,6 +369,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
} }
case MSG_CONFIRM_CARDS: { case MSG_CONFIRM_CARDS: {
player = BufferIO::ReadInt8(pbuf); player = BufferIO::ReadInt8(pbuf);
pbuf += 1;
count = BufferIO::ReadInt8(pbuf); count = BufferIO::ReadInt8(pbuf);
pbuf += count * 7; pbuf += count * 7;
DuelClient::ClientAnalyze(offset, pbuf - offset); DuelClient::ClientAnalyze(offset, pbuf - offset);
......
...@@ -763,6 +763,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -763,6 +763,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
} }
case MSG_CONFIRM_CARDS: { case MSG_CONFIRM_CARDS: {
player = BufferIO::ReadInt8(pbuf); player = BufferIO::ReadInt8(pbuf);
pbuf += 1;
count = BufferIO::ReadInt8(pbuf); count = BufferIO::ReadInt8(pbuf);
if(pbuf[5] != LOCATION_DECK) { if(pbuf[5] != LOCATION_DECK) {
pbuf += count * 7; pbuf += count * 7;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment