upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 19:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplyfy mpsync

Browse Source 
That huge block in pull_remote_choice existed becasue we don't want to
return becasue we dont wan't to make choices for sides that we only
controll  temporary.
With the 'new' idle controller type this can be simplyfied by just not
making choices for idle sides.
This commit is contained in:
gfgtdf 2014-11-25 19:28:56 +01:00
parent 324d4898de
commit 90c94876b1
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/playmp_controller.cpp
View File

@ -631,32 +631,6 @@ void playmp_controller::pull_remote_choice()
{
player_type_changed_ = true;
}
if(res == turn_info::PROCESS_RESTART_TURN_TEMPORARY_LOCAL || res == turn_info::PROCESS_SIDE_TEMPORARY_LOCAL)
{
expected_controller_changes++;
}
//If we still expect controler changes we cannot return.
//Becasue we might get into the situation that we want to do a decision that has already been name on another client.
//FIXME: if the server failed to process a transfer_side this is an infinite loop.
//as a temporary fix we abort the loop if it runs too long.
time_t time_start = time(NULL);
while((expected_controller_changes != 0) && (difftime(time(NULL), time_start) < 20))
{
playsingle_controller::handle_generic_event("ai_user_interact");
res = turn_data_.sync_network();
assert(res != turn_info::PROCESS_END_LINGER);
assert(res != turn_info::PROCESS_END_TURN);
if(res == turn_info::PROCESS_RESTART_TURN)
{
expected_controller_changes--;
}
else if(res == turn_info::PROCESS_RESTART_TURN_TEMPORARY_LOCAL || res == turn_info::PROCESS_SIDE_TEMPORARY_LOCAL)
{
expected_controller_changes++;
}
SDL_Delay(10);
}
turn_data_.send_data();
}
void playmp_controller::send_user_choice()

2
src/replay.cpp
View File

@ -1003,7 +1003,7 @@ static std::map<int, config> get_user_choice_internal(const std::string &name, c
if(retv.find(side) == retv.end())
{
//and it is local
if((*resources::teams)[side-1].is_local())
if((*resources::teams)[side-1].is_local() && !(*resources::teams)[side-1].is_idle())
{
//then we have to make a local choice.
local_side = side;