Skip to content

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

Merge branch 'server_mc' into server

parents c39fc021 a9ababcb
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
gframe/single_duel.cpp
View file @ 9c76b6dd
...@@ -634,9 +634,8 @@ void SingleDuel::DuelEndProc() { ...@@ -634,9 +634,8 @@ void SingleDuel::DuelEndProc() {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayers(cache_recorder, replay_recorder); NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
NetServer::StopServer(); NetServer::StopServer();
#else
duel_stage = DUEL_STAGE_END;
#endif #endif
duel_stage = DUEL_STAGE_END;
} else { } else {
int winc[3] = {0, 0, 0}; int winc[3] = {0, 0, 0};
for(int i = 0; i < duel_count; ++i) for(int i = 0; i < duel_count; ++i)
...@@ -652,9 +651,8 @@ void SingleDuel::DuelEndProc() { ...@@ -652,9 +651,8 @@ void SingleDuel::DuelEndProc() {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayers(cache_recorder, replay_recorder); NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
NetServer::StopServer(); NetServer::StopServer();
#else
duel_stage = DUEL_STAGE_END;
#endif #endif
duel_stage = DUEL_STAGE_END;
} else { } else {
if(players[0] != pplayer[0]) { if(players[0] != pplayer[0]) {
players[0] = pplayer[0]; players[0] = pplayer[0];
......
gframe/tag_duel.cpp
View file @ 9c76b6dd
...@@ -641,9 +641,8 @@ void TagDuel::DuelEndProc() { ...@@ -641,9 +641,8 @@ void TagDuel::DuelEndProc() {
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayers(cache_recorder, replay_recorder); NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
NetServer::StopServer(); NetServer::StopServer();
#else
duel_stage = DUEL_STAGE_END;
#endif #endif
duel_stage = DUEL_STAGE_END;
} }
void TagDuel::Surrender(DuelPlayer* dp) { void TagDuel::Surrender(DuelPlayer* dp) {
if(dp->type > 3 || !pduel) if(dp->type > 3 || !pduel)
......
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