Skip to content

Y
ygopro
Commit 12cd06ce authored by mercury233's avatar mercury233
Browse files
Options

fix face-down MSG_SPSUMMONING

parent d5044ff8
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 12 deletions
gframe/duelclient.cpp
View file @ 12cd06ce
...@@ -2912,12 +2912,14 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) { ...@@ -2912,12 +2912,14 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
else else
soundManager.PlaySoundEffect(SOUND_SPECIAL_SUMMON); soundManager.PlaySoundEffect(SOUND_SPECIAL_SUMMON);
myswprintf(event_string, dataManager.GetSysString(1605), dataManager.GetName(code)); myswprintf(event_string, dataManager.GetSysString(1605), dataManager.GetName(code));
mainGame->showcardcode = code; if(code) {
mainGame->showcarddif = 1; mainGame->showcardcode = code;
mainGame->showcard = 5; mainGame->showcarddif = 1;
mainGame->WaitFrameSignal(30); mainGame->showcard = 5;
mainGame->showcard = 0; mainGame->WaitFrameSignal(30);
mainGame->WaitFrameSignal(11); mainGame->showcard = 0;
mainGame->WaitFrameSignal(11);
}
} }
return true; return true;
} }
......
gframe/single_duel.cpp
View file @ 12cd06ce
...@@ -1036,9 +1036,16 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { ...@@ -1036,9 +1036,16 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
break; break;
} }
case MSG_SPSUMMONING: { case MSG_SPSUMMONING: {
pbufw = pbuf;
int cc = pbuf[4];
/*int cl = pbuf[5];*/
/*int cs = pbuf[6];*/
int cp = pbuf[7];
pbuf += 8; pbuf += 8;
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[cc], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); if (cp & POS_FACEDOWN)
BufferIO::Write<int32_t>(pbufw, 0);
NetServer::SendBufferToPlayer(players[1 - cc], STOC_GAME_MSG, offset, pbuf - offset);
for(auto oit = observers.begin(); oit != observers.end(); ++oit) for(auto oit = observers.begin(); oit != observers.end(); ++oit)
NetServer::ReSendToPlayer(*oit); NetServer::ReSendToPlayer(*oit);
break; break;
......
gframe/tag_duel.cpp
View file @ 12cd06ce
...@@ -1042,11 +1042,18 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { ...@@ -1042,11 +1042,18 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
break; break;
} }
case MSG_SPSUMMONING: { case MSG_SPSUMMONING: {
pbufw = pbuf;
int cc = pbuf[4];
/*int cl = pbuf[5];*/
/*int cs = pbuf[6];*/
int cp = pbuf[7];
pbuf += 8; pbuf += 8;
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(cur_player[cc], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); if (cp & POS_FACEDOWN)
NetServer::ReSendToPlayer(players[2]); BufferIO::Write<int32_t>(pbufw, 0);
NetServer::ReSendToPlayer(players[3]); for (int i = 0; i < 4; ++i)
if (players[i] != cur_player[cc])
NetServer::SendBufferToPlayer(players[i], STOC_GAME_MSG, offset, pbuf - offset);
for(auto oit = observers.begin(); oit != observers.end(); ++oit) for(auto oit = observers.begin(); oit != observers.end(); ++oit)
NetServer::ReSendToPlayer(*oit); NetServer::ReSendToPlayer(*oit);
break; break;
......
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