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

minor behavioral change to unit variation inheritance

Browse source
This commit is contained in:
Dominic Bolin 2006-05-14 21:06:24 +00:00
parent 405c1fd9e8
commit 007ccf9041
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/config.cpp
View file

@ -537,22 +537,31 @@ config config::merge_with(const config& c) const
child_map::const_iterator i;
for(i = child_changes.begin(); i != child_changes.end(); ++i) {
child_map::iterator itor = n.children.find(i->first);
size_t index = 0;
for(const_child_iterator j = i->second.begin(); j != i->second.end(); ++j) {
size_t last_index = itor != n.children.end() ? itor->second.size() : 0;
for(const_child_iterator j = i->second.begin(); j != i->second.end();) {
const config* item = *j;
if(i->first.empty()) {
++j;
continue;
}
const child_map::iterator itor = n.children.find(i->first);
if(itor != n.children.end() && index < itor->second.size()) {
*(itor->second[index]) = itor->second[index]->merge_with(*item);
} else {
if(j + 1 == i->second.end() && index >= last_index) {
break;
}
n.add_child(i->first,*item);
itor = n.children.find(i->first);
}
index++;
if(j + 1 != i->second.end()) {
++j;
}
}
}
return n;