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

Merge pull request #354 from mstrebel/bug-era-carryover

Browse source 
Fix: Era carryover in Tutorial doesn't work
This commit is contained in:
gfgtdf 2014-12-31 00:32:05 +01:00
commit db27f81d0f
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game_launcher.cpp
View file

@ -778,6 +778,8 @@ void game_launcher::set_tutorial()
state_ = saved_game();
state_.classification().campaign_type = game_classification::TUTORIAL;
state_.classification().campaign_define = "TUTORIAL";
state_.mp_settings().mp_era = "era_blank";
state_.mp_settings().show_connect = false;
state_.set_carryover_sides_start(
config_of("next_scenario", "tutorial")
);

5
src/saved_game.cpp
View file

@ -455,10 +455,7 @@ config saved_game::to_config() const
r.add_child("scenario", starting_pos_);
}
r.add_child(has_carryover_expanded_ ? "carryover_sides" : "carryover_sides_start" , carryover_);
if (classification_.campaign_type == game_classification::MULTIPLAYER
|| classification_.campaign_type == game_classification::SCENARIO) {
r.add_child("multiplayer", mp_settings_.to_config());
}
r.add_child("multiplayer", mp_settings_.to_config());
return r;
}