Skip to content

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

Merge branch 'server_mc' into server

parents 8280d32d 43a3e6ba
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
gframe/single_duel.cpp
View file @ f2c5e3f7
...@@ -269,9 +269,12 @@ void SingleDuel::LeaveGame(DuelPlayer* dp) { ...@@ -269,9 +269,12 @@ void SingleDuel::LeaveGame(DuelPlayer* dp) {
NetServer::ReSendToPlayer(*oit); NetServer::ReSendToPlayer(*oit);
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayers(cache_recorder, replay_recorder); NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
NetServer::StopServer();
#endif #endif
} }
#ifndef YGOPRO_SERVER_MODE
NetServer::DisconnectPlayer(dp); NetServer::DisconnectPlayer(dp);
#endif
} }
} }
} }
...@@ -634,8 +637,9 @@ void SingleDuel::DuelEndProc() { ...@@ -634,8 +637,9 @@ 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();
#endif #else
duel_stage = DUEL_STAGE_END; duel_stage = DUEL_STAGE_END;
#endif
} 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)
...@@ -651,8 +655,9 @@ void SingleDuel::DuelEndProc() { ...@@ -651,8 +655,9 @@ 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();
#endif #else
duel_stage = DUEL_STAGE_END; duel_stage = DUEL_STAGE_END;
#endif
} 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 @ f2c5e3f7
...@@ -641,8 +641,9 @@ void TagDuel::DuelEndProc() { ...@@ -641,8 +641,9 @@ 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();
#endif #else
duel_stage = DUEL_STAGE_END; duel_stage = DUEL_STAGE_END;
#endif
} }
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