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

Fix [modify_side][ai] again

Browse source 
A logic error caused any added aspects to be mixed together with
existing aspects if it was executed before the AI had been initialized.
This is the cause of the unknown aspect warnings from
GregoryLundberg/wesnoth#28
This commit is contained in:
Celtic Minstrel 2016-09-06 21:20:10 -04:00
parent 7db4527b0f
commit be7670bea5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ai/manager.cpp
View file

@ -165,7 +165,7 @@ void holder::modify_side_ai_config(config cfg)
if (this->readonly_context_ == nullptr) {
// if not initialized, append that config to the bottom of base cfg
// then, merge aspects with the same id
cfg_.merge_with(cfg);
cfg_.append_children(cfg);
cfg_.merge_children_by_attribute("aspect","id");
} else {
// else run 'add_facet' command on each [aspect][facet]
@ -718,7 +718,7 @@ void manager::modify_active_ai_config_old_for_side ( side_number side, const con
for (const config& cfg : ai_parameters) {
cfgs.add_child("ai", cfg);
}
cfgs.child_or_add("ai").add_child("stage");
cfgs.child_or_add("ai").add_child("stage")["name"] = "empty";
get_active_ai_holder_for_side(side).modify_side_ai_config(cfgs);
}