Skip to content

Y
ygopro-2pick
Commit 138ea4a4 authored by Momobako's avatar Momobako
Browse files
Options

Merge branch 'master' into beta

parents d93929f2 9719507c
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 8 deletions
gframe/single_duel.cpp
View file @ 138ea4a4
...@@ -1751,8 +1751,10 @@ void SingleDuel::RefreshMzone(int player, int flag, int use_cache) { ...@@ -1751,8 +1751,10 @@ void SingleDuel::RefreshMzone(int player, int flag, int use_cache) {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayer(replay_recorder); NetServer::ReSendToPlayer(replay_recorder);
#endif #endif
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)
...@@ -1777,8 +1779,10 @@ void SingleDuel::RefreshSzone(int player, int flag, int use_cache) { ...@@ -1777,8 +1779,10 @@ void SingleDuel::RefreshSzone(int player, int flag, int use_cache) {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayer(replay_recorder); NetServer::ReSendToPlayer(replay_recorder);
#endif #endif
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)
...@@ -1803,9 +1807,9 @@ void SingleDuel::RefreshHand(int player, int flag, int use_cache) { ...@@ -1803,9 +1807,9 @@ void SingleDuel::RefreshHand(int player, int flag, int use_cache) {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayer(replay_recorder); NetServer::ReSendToPlayer(replay_recorder);
#endif #endif
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 @ 138ea4a4
...@@ -1820,8 +1820,10 @@ void TagDuel::RefreshMzone(int player, int flag, int use_cache) { ...@@ -1820,8 +1820,10 @@ void TagDuel::RefreshMzone(int player, int flag, int use_cache) {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayer(replay_recorder); NetServer::ReSendToPlayer(replay_recorder);
#endif #endif
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)
...@@ -1850,8 +1852,10 @@ void TagDuel::RefreshSzone(int player, int flag, int use_cache) { ...@@ -1850,8 +1852,10 @@ void TagDuel::RefreshSzone(int player, int flag, int use_cache) {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayer(replay_recorder); NetServer::ReSendToPlayer(replay_recorder);
#endif #endif
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)
...@@ -1878,9 +1882,9 @@ void TagDuel::RefreshHand(int player, int flag, int use_cache) { ...@@ -1878,9 +1882,9 @@ void TagDuel::RefreshHand(int player, int flag, int use_cache) {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayer(replay_recorder); NetServer::ReSendToPlayer(replay_recorder);
#endif #endif
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