when populating game_state.variables_,

...snapshot/replay_start is now prioritized over savefile root
This commit is contained in:
Eugen Jiresch 2009-09-21 13:56:35 +00:00
parent ad296d85e7
commit ab13cb19e6

View File

@ -289,8 +289,16 @@ game_state::game_state(const config& cfg, bool show_replay) :
if(classification_.campaign_type.empty()) {
classification_.campaign_type = "scenario";
}
if (const config &vars = cfg.child("variables")) {
//priority of populating wml variables:
//snapshot -> replay_start -> root
if (const config &vars = snapshot.child("variables")) {
set_variables(vars);
}
else if (const config &vars = replay_start.child("variables")) {
set_variables(vars);
}
else if (const config &vars = cfg.child("variables")) {
set_variables(vars);
}
set_menu_items(cfg.child_range("menu_item"));