Skip to content

Y
ygopro
Commit 6880af21 authored by edo9300's avatar edo9300
Browse files
Options

Merge remote-tracking branch 'refs/remotes/Fluorohydride/master'

parents a40afad8 91a0f7bb
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 8 deletions
gframe/single_duel.cpp
View file @ 6880af21
...@@ -1495,8 +1495,10 @@ void SingleDuel::RefreshMzone(int player, int flag, int use_cache) { ...@@ -1495,8 +1495,10 @@ void SingleDuel::RefreshMzone(int player, int flag, int use_cache) {
BufferIO::WriteInt8(qbuf, LOCATION_MZONE); BufferIO::WriteInt8(qbuf, LOCATION_MZONE);
int len = query_field_card(pduel, player, LOCATION_MZONE, flag, (unsigned char*)qbuf, use_cache); int len = query_field_card(pduel, player, LOCATION_MZONE, flag, (unsigned char*)qbuf, use_cache);
NetServer::SendBufferToPlayer(players[player], STOC_GAME_MSG, query_buffer, len + 3); NetServer::SendBufferToPlayer(players[player], STOC_GAME_MSG, query_buffer, len + 3);
for (int i = 0; i < 5; ++i) { int qlen = 0;
while(qlen < len) {
int clen = BufferIO::ReadInt32(qbuf); int clen = BufferIO::ReadInt32(qbuf);
qlen += clen;
if (clen == 4) if (clen == 4)
continue; continue;
if (qbuf[11] & POS_FACEDOWN) if (qbuf[11] & POS_FACEDOWN)
...@@ -1515,8 +1517,10 @@ void SingleDuel::RefreshSzone(int player, int flag, int use_cache) { ...@@ -1515,8 +1517,10 @@ void SingleDuel::RefreshSzone(int player, int flag, int use_cache) {
BufferIO::WriteInt8(qbuf, LOCATION_SZONE); BufferIO::WriteInt8(qbuf, LOCATION_SZONE);
int len = query_field_card(pduel, player, LOCATION_SZONE, flag, (unsigned char*)qbuf, use_cache); int len = query_field_card(pduel, player, LOCATION_SZONE, flag, (unsigned char*)qbuf, use_cache);
NetServer::SendBufferToPlayer(players[player], STOC_GAME_MSG, query_buffer, len + 3); NetServer::SendBufferToPlayer(players[player], STOC_GAME_MSG, query_buffer, len + 3);
for (int i = 0; i < 8; ++i) { int qlen = 0;
while(qlen < len) {
int clen = BufferIO::ReadInt32(qbuf); int clen = BufferIO::ReadInt32(qbuf);
qlen += clen;
if (clen == 4) if (clen == 4)
continue; continue;
if (qbuf[11] & POS_FACEDOWN) if (qbuf[11] & POS_FACEDOWN)
...@@ -1535,9 +1539,9 @@ void SingleDuel::RefreshHand(int player, int flag, int use_cache) { ...@@ -1535,9 +1539,9 @@ void SingleDuel::RefreshHand(int player, int flag, int use_cache) {
BufferIO::WriteInt8(qbuf, LOCATION_HAND); BufferIO::WriteInt8(qbuf, LOCATION_HAND);
int len = query_field_card(pduel, player, LOCATION_HAND, flag | QUERY_IS_PUBLIC, (unsigned char*)qbuf, use_cache); int len = query_field_card(pduel, player, LOCATION_HAND, flag | QUERY_IS_PUBLIC, (unsigned char*)qbuf, use_cache);
NetServer::SendBufferToPlayer(players[player], STOC_GAME_MSG, query_buffer, len + 3); NetServer::SendBufferToPlayer(players[player], STOC_GAME_MSG, query_buffer, len + 3);
int qlen = 0, slen; int qlen = 0;
while(qlen < len) { while(qlen < len) {
slen = BufferIO::ReadInt32(qbuf); int slen = BufferIO::ReadInt32(qbuf);
int qflag = *(int*)qbuf; int qflag = *(int*)qbuf;
int pos = slen - 8; int pos = slen - 8;
if(qflag & QUERY_LSCALE) if(qflag & QUERY_LSCALE)
......
gframe/tag_duel.cpp
View file @ 6880af21
...@@ -1587,8 +1587,10 @@ void TagDuel::RefreshMzone(int player, int flag, int use_cache) { ...@@ -1587,8 +1587,10 @@ void TagDuel::RefreshMzone(int player, int flag, int use_cache) {
int pid = (player == 0) ? 0 : 2; int pid = (player == 0) ? 0 : 2;
NetServer::SendBufferToPlayer(players[pid], STOC_GAME_MSG, query_buffer, len + 3); NetServer::SendBufferToPlayer(players[pid], STOC_GAME_MSG, query_buffer, len + 3);
NetServer::ReSendToPlayer(players[pid + 1]); NetServer::ReSendToPlayer(players[pid + 1]);
for (int i = 0; i < 5; ++i) { int qlen = 0;
while(qlen < len) {
int clen = BufferIO::ReadInt32(qbuf); int clen = BufferIO::ReadInt32(qbuf);
qlen += clen;
if (clen == 4) if (clen == 4)
continue; continue;
if (qbuf[11] & POS_FACEDOWN) if (qbuf[11] & POS_FACEDOWN)
...@@ -1611,8 +1613,10 @@ void TagDuel::RefreshSzone(int player, int flag, int use_cache) { ...@@ -1611,8 +1613,10 @@ void TagDuel::RefreshSzone(int player, int flag, int use_cache) {
int pid = (player == 0) ? 0 : 2; int pid = (player == 0) ? 0 : 2;
NetServer::SendBufferToPlayer(players[pid], STOC_GAME_MSG, query_buffer, len + 3); NetServer::SendBufferToPlayer(players[pid], STOC_GAME_MSG, query_buffer, len + 3);
NetServer::ReSendToPlayer(players[pid + 1]); NetServer::ReSendToPlayer(players[pid + 1]);
for (int i = 0; i < 8; ++i) { int qlen = 0;
while(qlen < len) {
int clen = BufferIO::ReadInt32(qbuf); int clen = BufferIO::ReadInt32(qbuf);
qlen += clen;
if (clen == 4) if (clen == 4)
continue; continue;
if (qbuf[11] & POS_FACEDOWN) if (qbuf[11] & POS_FACEDOWN)
...@@ -1633,9 +1637,9 @@ void TagDuel::RefreshHand(int player, int flag, int use_cache) { ...@@ -1633,9 +1637,9 @@ void TagDuel::RefreshHand(int player, int flag, int use_cache) {
BufferIO::WriteInt8(qbuf, LOCATION_HAND); BufferIO::WriteInt8(qbuf, LOCATION_HAND);
int len = query_field_card(pduel, player, LOCATION_HAND, flag | QUERY_IS_PUBLIC, (unsigned char*)qbuf, use_cache); int len = query_field_card(pduel, player, LOCATION_HAND, flag | QUERY_IS_PUBLIC, (unsigned char*)qbuf, use_cache);
NetServer::SendBufferToPlayer(cur_player[player], STOC_GAME_MSG, query_buffer, len + 3); NetServer::SendBufferToPlayer(cur_player[player], STOC_GAME_MSG, query_buffer, len + 3);
int qlen = 0, slen; int qlen = 0;
while(qlen < len) { while(qlen < len) {
slen = BufferIO::ReadInt32(qbuf); int slen = BufferIO::ReadInt32(qbuf);
int qflag = *(int*)qbuf; int qflag = *(int*)qbuf;
int pos = slen - 8; int pos = slen - 8;
if(qflag & QUERY_LSCALE) if(qflag & QUERY_LSCALE)
......
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