Skip to content

Y
ygopro-2pick
Commit 5f6a616e authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'server_mc' into server

parents 6f16c69b 548ccf2a
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 0 deletions
gframe/single_duel.cpp
View file @ 5f6a616e
...@@ -1853,8 +1853,18 @@ void SingleDuel::RequestField(DuelPlayer* dp) { ...@@ -1853,8 +1853,18 @@ void SingleDuel::RequestField(DuelPlayer* dp) {
RefreshExtra(player, 0xffdfff, 0, dp); RefreshExtra(player, 0xffdfff, 0, dp);
RefreshRemoved(1 - player, 0xffdfff, 0, dp); RefreshRemoved(1 - player, 0xffdfff, 0, dp);
RefreshRemoved(player, 0xffdfff, 0, dp); RefreshRemoved(player, 0xffdfff, 0, dp);
/*
if(dp == players[last_response]) if(dp == players[last_response])
WaitforResponse(last_response); WaitforResponse(last_response);
*/
STOC_TimeLimit sctl;
sctl.player = 1 - last_response;
sctl.left_time = time_limit[1 - last_response];
NetServer::SendPacketToPlayer(dp, STOC_TIME_LIMIT, sctl);
sctl.player = last_response;
sctl.left_time = time_limit[last_response] - time_elapsed;
NetServer::SendPacketToPlayer(dp, STOC_TIME_LIMIT, sctl);
NetServer::SendPacketToPlayer(dp, STOC_FIELD_FINISH); NetServer::SendPacketToPlayer(dp, STOC_FIELD_FINISH);
} }
#endif //YGOPRO_SERVER_MODE #endif //YGOPRO_SERVER_MODE
......
gframe/tag_duel.cpp
View file @ 5f6a616e
...@@ -1938,8 +1938,18 @@ void TagDuel::RequestField(DuelPlayer* dp) { ...@@ -1938,8 +1938,18 @@ void TagDuel::RequestField(DuelPlayer* dp) {
RefreshExtra(player, 0xffdfff, 0, dp); RefreshExtra(player, 0xffdfff, 0, dp);
RefreshRemoved(1 - player, 0xffdfff, 0, dp); RefreshRemoved(1 - player, 0xffdfff, 0, dp);
RefreshRemoved(player, 0xffdfff, 0, dp); RefreshRemoved(player, 0xffdfff, 0, dp);
/*
if(dp == cur_player[last_response]) if(dp == cur_player[last_response])
WaitforResponse(last_response); WaitforResponse(last_response);
*/
STOC_TimeLimit sctl;
sctl.player = 1 - last_response;
sctl.left_time = time_limit[1 - last_response];
NetServer::SendPacketToPlayer(dp, STOC_TIME_LIMIT, sctl);
sctl.player = last_response;
sctl.left_time = time_limit[last_response] - time_elapsed;
NetServer::SendPacketToPlayer(dp, STOC_TIME_LIMIT, sctl);
NetServer::SendPacketToPlayer(dp, STOC_FIELD_FINISH); NetServer::SendPacketToPlayer(dp, STOC_FIELD_FINISH);
} }
#endif //YGOPRO_SERVER_MODE #endif //YGOPRO_SERVER_MODE
......
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