Skip to content

Y
ygopro
Commit 26071d2e authored by nanahira's avatar nanahira
Browse files
Options

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

parents 8c308d90 77bb40f4
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
gframe/single_duel.cpp
View file @ 26071d2e
...@@ -1932,9 +1932,9 @@ void SingleDuel::RequestField(DuelPlayer* dp) { ...@@ -1932,9 +1932,9 @@ void SingleDuel::RequestField(DuelPlayer* dp) {
WriteMsg([&](uint8_t*& pbuf) { WriteMsg([&](uint8_t*& pbuf) {
BufferIO::WriteInt8(pbuf, MSG_START); BufferIO::WriteInt8(pbuf, MSG_START);
BufferIO::WriteInt8(pbuf, player); BufferIO::WriteInt8(pbuf, player);
BufferIO::WriteInt8(pbuf, this->host_info.duel_rule); BufferIO::WriteInt8(pbuf, host_info.duel_rule);
BufferIO::WriteInt32(pbuf, this->host_info.start_lp); BufferIO::WriteInt32(pbuf, host_info.start_lp);
BufferIO::WriteInt32(pbuf, this->host_info.start_lp); BufferIO::WriteInt32(pbuf, host_info.start_lp);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
...@@ -1951,11 +1951,11 @@ void SingleDuel::RequestField(DuelPlayer* dp) { ...@@ -1951,11 +1951,11 @@ void SingleDuel::RequestField(DuelPlayer* dp) {
WriteMsg([&](uint8_t*& pbuf) { WriteMsg([&](uint8_t*& pbuf) {
BufferIO::WriteInt8(pbuf, MSG_NEW_PHASE); BufferIO::WriteInt8(pbuf, MSG_NEW_PHASE);
BufferIO::WriteInt16(pbuf, this->phase); BufferIO::WriteInt16(pbuf, phase);
}); });
WriteMsg([&](uint8_t*& pbuf) { WriteMsg([&](uint8_t*& pbuf) {
auto length = query_field_info(this->pduel, pbuf); auto length = query_field_info(pduel, pbuf);
pbuf += length; pbuf += length;
}); });
...@@ -1983,7 +1983,7 @@ void SingleDuel::RequestField(DuelPlayer* dp) { ...@@ -1983,7 +1983,7 @@ void SingleDuel::RequestField(DuelPlayer* dp) {
BufferIO::WriteInt8(pbuf, MSG_DECK_TOP); BufferIO::WriteInt8(pbuf, MSG_DECK_TOP);
BufferIO::WriteInt8(pbuf, i); BufferIO::WriteInt8(pbuf, i);
BufferIO::WriteInt8(pbuf, 0); BufferIO::WriteInt8(pbuf, 0);
BufferIO::WriteInt32(pbuf, this->deck_top[i]); BufferIO::WriteInt32(pbuf, deck_top[i]);
}); });
} }
} }
......
gframe/tag_duel.cpp
View file @ 26071d2e
...@@ -2030,9 +2030,9 @@ void TagDuel::RequestField(DuelPlayer* dp) { ...@@ -2030,9 +2030,9 @@ void TagDuel::RequestField(DuelPlayer* dp) {
WriteMsg([&](uint8_t*& pbuf) { WriteMsg([&](uint8_t*& pbuf) {
BufferIO::WriteInt8(pbuf, MSG_START); BufferIO::WriteInt8(pbuf, MSG_START);
BufferIO::WriteInt8(pbuf, player); BufferIO::WriteInt8(pbuf, player);
BufferIO::WriteInt8(pbuf, this->host_info.duel_rule); BufferIO::WriteInt8(pbuf, host_info.duel_rule);
BufferIO::WriteInt32(pbuf, this->host_info.start_lp); BufferIO::WriteInt32(pbuf, host_info.start_lp);
BufferIO::WriteInt32(pbuf, this->host_info.start_lp); BufferIO::WriteInt32(pbuf, host_info.start_lp);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
...@@ -2051,11 +2051,11 @@ void TagDuel::RequestField(DuelPlayer* dp) { ...@@ -2051,11 +2051,11 @@ void TagDuel::RequestField(DuelPlayer* dp) {
WriteMsg([&](uint8_t*& pbuf) { WriteMsg([&](uint8_t*& pbuf) {
BufferIO::WriteInt8(pbuf, MSG_NEW_PHASE); BufferIO::WriteInt8(pbuf, MSG_NEW_PHASE);
BufferIO::WriteInt16(pbuf, this->phase); BufferIO::WriteInt16(pbuf, phase);
}); });
WriteMsg([&](uint8_t*& pbuf) { WriteMsg([&](uint8_t*& pbuf) {
auto length = query_field_info(this->pduel, pbuf); auto length = query_field_info(pduel, pbuf);
pbuf += length; pbuf += length;
}); });
...@@ -2083,7 +2083,7 @@ void TagDuel::RequestField(DuelPlayer* dp) { ...@@ -2083,7 +2083,7 @@ void TagDuel::RequestField(DuelPlayer* dp) {
BufferIO::WriteInt8(pbuf, MSG_DECK_TOP); BufferIO::WriteInt8(pbuf, MSG_DECK_TOP);
BufferIO::WriteInt8(pbuf, i); BufferIO::WriteInt8(pbuf, i);
BufferIO::WriteInt8(pbuf, 0); BufferIO::WriteInt8(pbuf, 0);
BufferIO::WriteInt32(pbuf, this->deck_top[i]); BufferIO::WriteInt32(pbuf, deck_top[i]);
}); });
} }
} }
......
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