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

Revert commit eb1f002e81723ea66c37f2e0e1438f91f1afa6cc.

Browse Source 
This re-introduces an older problem, but fixes bug #20861.
This commit is contained in:
Boldizsár Lipka 2013-06-04 22:12:41 +02:00
parent 6daa64099b
commit 553ab064a8
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/playcampaign.cpp
View File

@ -88,18 +88,6 @@ static void team_init(config& level, game_state& gamestate){
gamestate.carryover_sides = sides.to_config();
}
static void mp_events_init(config& level, game_state& gamestate, const config& gamecfg){
const std::string& era = gamestate.mp_settings().mp_era;
if (!era.empty()) {
level.add_child("era", gamecfg.find_child("era", "id", era));
}
const std::vector<std::string>& mods = gamestate.mp_settings().active_mods;
BOOST_FOREACH (const std::string& mod, mods) {
level.add_child("modification", gamecfg.find_child("modification", "id", mod));
}
}
static void store_carryover(game_state& gamestate, playsingle_controller& playcontroller, display& disp, const end_level_data& end_level){
bool has_next_scenario = !resources::gamedata->next_scenario().empty() &&
resources::gamedata->next_scenario() != "null";
@ -278,7 +266,6 @@ static LEVEL_RESULT playmp_scenario(const config& game_config,
config init_level = *level;
team_init(init_level, state_of_game);
mp_events_init(init_level, state_of_game, game_config);
playmp_controller playcontroller(init_level, state_of_game, ticks, num_turns,
game_config, disp.video(), skip_replay, io_type == IO_SERVER);