Skip to content

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

fix

parent 4b5715fc
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
gframe/single_duel.cpp
View file @ 962ea689
...@@ -2210,14 +2210,9 @@ void SingleDuel::SingleTimer(evutil_socket_t fd, short events, void* arg) { ...@@ -2210,14 +2210,9 @@ void SingleDuel::SingleTimer(evutil_socket_t fd, short events, void* arg) {
NetServer::ReSendToPlayer(sd->players[1]); NetServer::ReSendToPlayer(sd->players[1]);
for(auto oit = sd->observers.begin(); oit != sd->observers.end(); ++oit) for(auto oit = sd->observers.begin(); oit != sd->observers.end(); ++oit)
NetServer::ReSendToPlayer(*oit); NetServer::ReSendToPlayer(*oit);
<<<<<<< HEAD
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
NetServer::ReSendToPlayers(sd->cache_recorder, sd->replay_recorder); NetServer::ReSendToPlayers(sd->cache_recorder, sd->replay_recorder);
#endif #endif
sd->match_result[sd->duel_count] = sd->players[1 - player]->player_id;
++sd->duel_count;
sd->tp_player = player;
=======
if(sd->players[player] == sd->pplayer[player]) { if(sd->players[player] == sd->pplayer[player]) {
sd->match_result[sd->duel_count++] = 1 - player; sd->match_result[sd->duel_count++] = 1 - player;
sd->tp_player = player; sd->tp_player = player;
...@@ -2225,7 +2220,6 @@ void SingleDuel::SingleTimer(evutil_socket_t fd, short events, void* arg) { ...@@ -2225,7 +2220,6 @@ void SingleDuel::SingleTimer(evutil_socket_t fd, short events, void* arg) {
sd->match_result[sd->duel_count++] = player; sd->match_result[sd->duel_count++] = player;
sd->tp_player = 1 - player; sd->tp_player = 1 - player;
} }
>>>>>>> master
sd->EndDuel(); sd->EndDuel();
sd->DuelEndProc(); sd->DuelEndProc();
event_del(sd->etimer); event_del(sd->etimer);
......
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