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

fixup 28ffcc54483942c598d24cecd4f65534f0185c51

Browse Source 
I didn't see that store_carryover(state_of_game, playcontroller, disp, end_level); uses end_level.
This commit is contained in:
gfgtdf 2014-05-29 22:27:50 +02:00
parent 28ffcc5448
commit b6efcec496
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/playcampaign.cpp
View File

@ -292,6 +292,10 @@ static LEVEL_RESULT playsingle_scenario(const config& game_config,
LEVEL_RESULT res = playcontroller.play_scenario(story, skip_replay); LEVEL_RESULT res = playcontroller.play_scenario(story, skip_replay);
end_level = playcontroller.get_end_level_data_const();
config& cfg_end_level = state_of_game.carryover_sides.child_or_add("end_level_data");
end_level.write(cfg_end_level);
if (res == DEFEAT) { if (res == DEFEAT) {
if (resources::persist != NULL) if (resources::persist != NULL)
resources::persist->end_transaction(); resources::persist->end_transaction();
@ -315,10 +319,6 @@ static LEVEL_RESULT playsingle_scenario(const config& game_config,
} }
} }
end_level = playcontroller.get_end_level_data_const();
config& cfg_end_level = state_of_game.carryover_sides.child_or_add("end_level_data");
end_level.write(cfg_end_level);
return res; return res;
} }
@ -339,6 +339,10 @@ static LEVEL_RESULT playmp_scenario(const config& game_config,
game_config, disp.video(), skip_replay, blindfold_replay, io_type == IO_SERVER); game_config, disp.video(), skip_replay, blindfold_replay, io_type == IO_SERVER);
LEVEL_RESULT res = playcontroller.play_scenario(story, skip_replay); LEVEL_RESULT res = playcontroller.play_scenario(story, skip_replay);
end_level = playcontroller.get_end_level_data_const();
config& cfg_end_level = state_of_game.carryover_sides.child_or_add("end_level_data");
end_level.write(cfg_end_level);
//Check if the player started as mp client and changed to host //Check if the player started as mp client and changed to host
if (io_type == IO_CLIENT && playcontroller.is_host()) if (io_type == IO_CLIENT && playcontroller.is_host())
io_type = IO_SERVER; io_type = IO_SERVER;
@ -368,10 +372,6 @@ static LEVEL_RESULT playmp_scenario(const config& game_config,
} }
} }
end_level = playcontroller.get_end_level_data_const();
config& cfg_end_level = state_of_game.carryover_sides.child_or_add("end_level_data");
end_level.write(cfg_end_level);
return res; return res;
} }