0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed control transfer after player leaves MP game (bug #13238)

Browse source
This commit is contained in:
Pauli Nieminen 2009-04-16 10:16:09 +00:00
parent a1133a11d2
commit 66a2a7e2f1
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -98,6 +98,7 @@ Version 1.7.0-svn:
* Fixed handling of floating-point WML constants on localized Windows
(impacts "submerge" animations and AI settings)
* Improved random village naming
* Fixed control transfer after player leaves MP game (bug #13238)
* Fixed a bug with auto-stored WML variables not being restored correctly
Version 1.6a:

10
src/playturn.cpp
View file

@ -271,12 +271,20 @@ turn_info::PROCESS_DATA_RESULT turn_info::process_network_data(const config& cfg
throw end_level_exception(QUIT);
default:
if (action > 2) {
{
// Server thinks this side is ours now so in case of error transfering side we have to make local state to same as what server thinks it is.
teams_[side_index].make_human();
teams_[side_index].set_current_player("human"+side_str);
if(have_leader) leader->second.rename("human"+side_str);
}
const size_t index = static_cast<size_t>(action - 3);
if (index < observers.size()) {
change_side_controller(side_str, observers[index], false /*not our own side*/);
} else if (index < options.size() - 1) {
size_t i = index - observers.size();
change_side_controller(side_str, allies[i]->save_id(), false /*not our own side*/);
change_side_controller(side_str, allies[i]->current_player(), false /*not our own side*/);
} else {
teams_[side_index].make_human_ai();
teams_[side_index].set_current_player("ai"+side_str);