Skip to content

Y
ygopro
Commit 16c5a77a authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch 'hub/patch-server-facedown-ss' into server-develop

parents 969fe31f bcc3d5e0
Pipeline #40084 passed with stages
        in 4 minutes and 40 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 38 additions and 14 deletions
        gframe/duelclient.cpp
        View file @ 16c5a77a
        ...@@ -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 @ 16c5a77a
        ...@@ -1308,13 +1308,23 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { ...@@ -1308,13 +1308,23 @@ 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]); #ifdef YGOPRO_SERVER_MODE
        NetServer::ReSendToPlayer(replay_recorder);
        #endif
        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);
        #ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
        NetServer::ReSendToPlayers(cache_recorder, replay_recorder); NetServer::ReSendToPlayer(cache_recorder);
        #endif #endif
        break; break;
        } }
        ......
        gframe/tag_duel.cpp
        View file @ 16c5a77a
        ...@@ -1300,15 +1300,27 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { ...@@ -1300,15 +1300,27 @@ 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); auto pid = (cc == 0) ? 0 : 2;
        NetServer::ReSendToPlayer(players[1]); NetServer::SendBufferToPlayer(players[pid], STOC_GAME_MSG, offset, pbuf - offset);
        NetServer::ReSendToPlayer(players[2]); NetServer::ReSendToPlayer(players[pid + 1]);
        NetServer::ReSendToPlayer(players[3]); #ifdef YGOPRO_SERVER_MODE
        NetServer::ReSendToPlayer(replay_recorder);
        #endif
        if (cp & POS_FACEDOWN)
        BufferIO::Write<int32_t>(pbufw, 0);
        pid = 2 - pid;
        NetServer::SendBufferToPlayer(players[pid], STOC_GAME_MSG, offset, pbuf - offset);
        NetServer::ReSendToPlayer(players[pid + 1]);
        for(auto oit = observers.begin(); oit != observers.end(); ++oit) for(auto oit = observers.begin(); oit != observers.end(); ++oit)
        NetServer::ReSendToPlayer(*oit); NetServer::ReSendToPlayer(*oit);
        #ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
        NetServer::ReSendToPlayers(cache_recorder, replay_recorder); NetServer::ReSendToPlayer(cache_recorder);
        #endif #endif
        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