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

Change a config to const config so operator[] does not add attributes.

Browse source
This commit is contained in:
JaMiT 2014-02-22 18:46:17 -06:00
parent f10eaeb0af
commit 7c17ae2970
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/config.cpp
View file

@ -1257,12 +1257,13 @@ void config::merge_with(const config& c)
if (j != c.children.end()) {
unsigned &visits = visitations[tag];
if(visits < j->second.size()) {
// Get a const config so we do not add attributes.
const config & merge_child = *j->second[visits++];
if ((*j->second[visits])["__remove"].to_bool()) {
visits++;
if ( merge_child["__remove"].to_bool() ) {
to_remove.push_back(*i);
} else
(i->pos->second[i->index])->merge_with(*j->second[visits++]);
(i->pos->second[i->index])->merge_with(merge_child);
}
}
}