Skip to content

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

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

parents fd6ca506 2ea30047
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
gframe/single_duel.cpp
View file @ a0bed809
...@@ -1836,7 +1836,7 @@ void SingleDuel::RequestField(DuelPlayer* dp) { ...@@ -1836,7 +1836,7 @@ void SingleDuel::RequestField(DuelPlayer* dp) {
int player = dp->type; int player = dp->type;
NetServer::SendPacketToPlayer(dp, STOC_DUEL_START); NetServer::SendPacketToPlayer(dp, STOC_DUEL_START);
char startbuf[32], *pbuf = startbuf; unsigned char startbuf[32], *pbuf = startbuf;
BufferIO::WriteInt8(pbuf, MSG_START); BufferIO::WriteInt8(pbuf, MSG_START);
BufferIO::WriteInt8(pbuf, player); BufferIO::WriteInt8(pbuf, player);
BufferIO::WriteInt8(pbuf, host_info.duel_rule); BufferIO::WriteInt8(pbuf, host_info.duel_rule);
...@@ -1852,18 +1852,18 @@ void SingleDuel::RequestField(DuelPlayer* dp) { ...@@ -1852,18 +1852,18 @@ void SingleDuel::RequestField(DuelPlayer* dp) {
if(turn_player == 1) if(turn_player == 1)
newturn_count = 2; newturn_count = 2;
for(int i = 0; i < newturn_count; i++) { for(int i = 0; i < newturn_count; i++) {
char turnbuf[2], *pbuf_t = turnbuf; unsigned char turnbuf[2], *pbuf_t = turnbuf;
BufferIO::WriteInt8(pbuf_t, MSG_NEW_TURN); BufferIO::WriteInt8(pbuf_t, MSG_NEW_TURN);
BufferIO::WriteInt8(pbuf_t, i); BufferIO::WriteInt8(pbuf_t, i);
NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, turnbuf, 2); NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, turnbuf, 2);
} }
char phasebuf[4], *pbuf_p = phasebuf; unsigned char phasebuf[4], *pbuf_p = phasebuf;
BufferIO::WriteInt8(pbuf_p, MSG_NEW_PHASE); BufferIO::WriteInt8(pbuf_p, MSG_NEW_PHASE);
BufferIO::WriteInt16(pbuf_p, phase); BufferIO::WriteInt16(pbuf_p, phase);
NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, phasebuf, 3); NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, phasebuf, 3);
char query_buffer[1024]; unsigned char query_buffer[1024];
int length = query_field_info(pduel, (unsigned char*)query_buffer); int length = query_field_info(pduel, (unsigned char*)query_buffer);
NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, query_buffer, length); NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, query_buffer, length);
RefreshMzone(1 - player, 0xefffff, 0, dp); RefreshMzone(1 - player, 0xefffff, 0, dp);
...@@ -2111,7 +2111,7 @@ if(!dp || dp == players[player]) ...@@ -2111,7 +2111,7 @@ if(!dp || dp == players[player])
qbuf += clen - 4; qbuf += clen - 4;
} }
if(!dp || dp == players[1 - player]) if(!dp || dp == players[1 - player])
NetServer::SendBufferToPlayer(players[1 - player], STOC_GAME_MSG, query_buffer, len + 3); NetServer::SendBufferToPlayer(players[1 - player], STOC_GAME_MSG, query_buffer.data(), len + 3);
if(!dp) if(!dp)
for(auto pit = observers.begin(); pit != observers.end(); ++pit) for(auto pit = observers.begin(); pit != observers.end(); ++pit)
NetServer::ReSendToPlayer(*pit); NetServer::ReSendToPlayer(*pit);
......
gframe/tag_duel.cpp
View file @ a0bed809
...@@ -1950,7 +1950,7 @@ void TagDuel::RequestField(DuelPlayer* dp) { ...@@ -1950,7 +1950,7 @@ void TagDuel::RequestField(DuelPlayer* dp) {
int player = (dp->type > 1) ? 1 : 0; int player = (dp->type > 1) ? 1 : 0;
NetServer::SendPacketToPlayer(dp, STOC_DUEL_START); NetServer::SendPacketToPlayer(dp, STOC_DUEL_START);
char startbuf[32], *pbuf = startbuf; unsigned char startbuf[32], *pbuf = startbuf;
BufferIO::WriteInt8(pbuf, MSG_START); BufferIO::WriteInt8(pbuf, MSG_START);
BufferIO::WriteInt8(pbuf, player); BufferIO::WriteInt8(pbuf, player);
BufferIO::WriteInt8(pbuf, host_info.duel_rule); BufferIO::WriteInt8(pbuf, host_info.duel_rule);
...@@ -1966,18 +1966,18 @@ void TagDuel::RequestField(DuelPlayer* dp) { ...@@ -1966,18 +1966,18 @@ void TagDuel::RequestField(DuelPlayer* dp) {
if(newturn_count == 0) if(newturn_count == 0)
newturn_count = 4; newturn_count = 4;
for(int i = 0; i < newturn_count; i++) { for(int i = 0; i < newturn_count; i++) {
char turnbuf[2], *pbuf_t = turnbuf; unsigned char turnbuf[2], *pbuf_t = turnbuf;
BufferIO::WriteInt8(pbuf_t, MSG_NEW_TURN); BufferIO::WriteInt8(pbuf_t, MSG_NEW_TURN);
BufferIO::WriteInt8(pbuf_t, i % 2); BufferIO::WriteInt8(pbuf_t, i % 2);
NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, turnbuf, 2); NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, turnbuf, 2);
} }
char phasebuf[4], *pbuf_p = phasebuf; unsigned char phasebuf[4], *pbuf_p = phasebuf;
BufferIO::WriteInt8(pbuf_p, MSG_NEW_PHASE); BufferIO::WriteInt8(pbuf_p, MSG_NEW_PHASE);
BufferIO::WriteInt16(pbuf_p, phase); BufferIO::WriteInt16(pbuf_p, phase);
NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, phasebuf, 3); NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, phasebuf, 3);
char query_buffer[1024]; unsigned char query_buffer[1024];
int length = query_field_info(pduel, (unsigned char*)query_buffer); int length = query_field_info(pduel, (unsigned char*)query_buffer);
NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, query_buffer, length); NetServer::SendBufferToPlayer(dp, STOC_GAME_MSG, query_buffer, length);
RefreshMzone(1 - player, 0xefffff, 0, dp); RefreshMzone(1 - player, 0xefffff, 0, dp);
......
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