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

Partially revert 569ef65e09 to fix a bug.

Browse source 
The next_scenario in SP won't get loaded.
This commit is contained in:
Andrius Silinskas 2013-09-06 16:08:30 +01:00
parent a380cd12cd
commit 4da56aef68
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/playcampaign.cpp
View file

@ -548,14 +548,18 @@ LEVEL_RESULT play_game(game_display& disp, game_state& gamestate,
// Retain carryover_sides_start, as the config from the server
// doesn't contain it.
gamestate.carryover_sides_start = sides.to_config();
} else if (io_type == IO_SERVER) {
} else {
// Retrieve next scenario data.
scenario = &game_config.find_child(type, "id",
gamestate.carryover_sides_start["next_scenario"]);
if (*scenario) {
if (!*scenario) {
scenario = NULL;
} else {
starting_pos = *scenario;
scenario = &starting_pos;
}
if (io_type == IO_SERVER && scenario != NULL) {
// Apply carryover before passing a scenario data to the
// mp::connect_engine.
team_init(starting_pos, gamestate);
@ -605,8 +609,6 @@ LEVEL_RESULT play_game(game_display& disp, game_state& gamestate,
if(map_data.empty() && (*scenario)["map_generation"] != "") {
generate_map(scenario);
}*/
} else {
scenario = NULL;
}
}