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

Merge pull request #472 from CelticMinstrel/effect_apply_to

Browse source 
Let [effect]apply_to=new_advancement add multiple AMLAs
This commit is contained in:
Charles Dang 2015-08-23 16:56:15 +11:00
commit 4464a05bb5
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/unit.cpp
View file

@ -1947,9 +1947,13 @@ void unit::add_modification(const std::string& mod_type, const config& mod, bool
std::copy(temp_advances.begin(), temp_advances.end(), std::back_inserter(advances_to_));
}
}
else {
// Possible TODO: Honour replace=yes
cfg_.add_child("advancement", effect);
if (effect.has_child("advancement")) {
if (replace) {
cfg_.clear_children("advancement");
}
config temp = effect;
cfg_.splice_children(temp, "advancement");
}
} else if (apply_to == "remove_advancement") {
const std::string &types = effect["types"];