Merge branch 'server_mc' into server

gframe/single_duel.cpp

@@ -269,9 +269,12 @@ void SingleDuel::LeaveGame(DuelPlayer* dp) {
 					NetServer::ReSendToPlayer(*oit);
 #ifdef YGOPRO_SERVER_MODE
 				NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
+				NetServer::StopServer();
 #endif
 			}
+#ifndef YGOPRO_SERVER_MODE
 			NetServer::DisconnectPlayer(dp);
+#endif
 		}
 	}
 }
@@ -634,8 +637,9 @@ void SingleDuel::DuelEndProc() {
 #ifdef YGOPRO_SERVER_MODE
 		NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
 		NetServer::StopServer();
-#endif
+#else
 		duel_stage = DUEL_STAGE_END;
+#endif
 	} else {
 		int winc[3] = {0, 0, 0};
 		for(int i = 0; i < duel_count; ++i)
@@ -651,8 +655,9 @@ void SingleDuel::DuelEndProc() {
 #ifdef YGOPRO_SERVER_MODE
 			NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
 			NetServer::StopServer();
-#endif
+#else
 			duel_stage = DUEL_STAGE_END;
+#endif
 		} else {
 			if(players[0] != pplayer[0]) {
 				players[0] = pplayer[0];

gframe/tag_duel.cpp

@@ -641,8 +641,9 @@ void TagDuel::DuelEndProc() {
 #ifdef YGOPRO_SERVER_MODE
 	NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
 	NetServer::StopServer();
-#endif
+#else
 	duel_stage = DUEL_STAGE_END;
+#endif
 }
 void TagDuel::Surrender(DuelPlayer* dp) {
 	if(dp->type > 3 || !pduel)