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

Fix a bug where side controllers wouldn't be updated correctly after a reload.

Browse source
This commit is contained in:
Christian Bielert 2009-02-11 09:24:46 +00:00
parent bba252e5e3
commit 81f7f195a2
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/multiplayer_ui.cpp
View file

@ -148,12 +148,17 @@ void level_to_gamestate(config& level, game_state& state)
//In any type of reload(normal save or start-of-scenario) the players could have
//changed and need to be replaced
if(saved_game || start_of_scenario){
const config::child_list& snapshot_sides = state.snapshot.get_children("side");
const config::child_list& saved_sides = (saved_game ?
state.snapshot.get_children("side") :
state.starting_pos.get_children("side"));
const config::child_list& level_sides = level.get_children("side");
for(config::child_list::const_iterator side = snapshot_sides.begin(); side != snapshot_sides.end(); ++side) {
for(config::child_list::const_iterator side = saved_sides.begin(); side != saved_sides.end(); ++side) {
for(config::child_list::const_iterator lside = level_sides.begin(); lside != level_sides.end(); ++lside) {
if ( ((**side)["side"] == (**lside)["side"])
&& ((**side)["current_player"] != (**lside)["current_player"]) ){
if ( ((**side)["side"] == (**lside)["side"]) && (
((**side)["current_player"] != (**lside)["current_player"]) ||
((**side)["controller"] != (**lside)["controller"]) )){
(**side)["current_player"] = (**lside)["current_player"];
(**side)["id"] = (**lside)["id"];
(**side)["save_id"] = (**lside)["save_id"];