Skip to content

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

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

parents b731cece 4f435518
Pipeline #28634 failed with stages
        in 37 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 0 additions and 14 deletions
        gframe/single_duel.cpp
        View file @ 731f44ff
        ...@@ -179,13 +179,6 @@ void SingleDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) ...@@ -179,13 +179,6 @@ void SingleDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater)
        } }
        } }
        void SingleDuel::LeaveGame(DuelPlayer* dp) { void SingleDuel::LeaveGame(DuelPlayer* dp) {
        #ifdef YGOPRO_SERVER_MODE
        if(dp->type == 0 && duel_stage != DUEL_STAGE_BEGIN) {
        EndDuel();
        NetServer::StopServer();
        return;
        }
        #endif
        if(dp == host_player) { if(dp == host_player) {
        #ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
        int host_pos; int host_pos;
        ......
        gframe/tag_duel.cpp
        View file @ 731f44ff
        ...@@ -167,13 +167,6 @@ void TagDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) { ...@@ -167,13 +167,6 @@ void TagDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) {
        } }
        } }
        void TagDuel::LeaveGame(DuelPlayer* dp) { void TagDuel::LeaveGame(DuelPlayer* dp) {
        #ifdef YGOPRO_SERVER_MODE
        if(dp->type == 0 && duel_stage != DUEL_STAGE_BEGIN) {
        EndDuel();
        NetServer::StopServer();
        return;
        }
        #endif
        if(dp == host_player) { if(dp == host_player) {
        #ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
        int host_pos; int host_pos;
        ......
        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