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

Fix bug #12603:

Browse source 
items appearing in the traits.

Only reference names of effects that are in the 'trait' category.
This commit is contained in:
Guillaume Melquiond 2005-04-29 21:27:43 +00:00
parent 9089fb979b
commit 97f656b730
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -3,7 +3,8 @@ CVS HEAD:
* starting position in editor now starts at player 1 (#10625)
* fixed female units not appearing in help (broken since 0.9.0)
* reduced required width of weapon area in help
* better diagnostics on parsing: line numbers
* better diagnostics on parsing: file inclusion sequence
* fixed items appearing in traits description (#12603)
* campaign improvements:
* fix Dacyn not being [recall]-ed in Unexpected Appearance (Eastern Invasion) (#10619)
* new map and scenario modification for Drowned Plains (Eastern Invasion)

28
src/unit.cpp
View file

@ -1186,32 +1186,34 @@ void unit::apply_modifications()
log_scope("apply mods");
modificationDescriptions_.clear();
std::vector<t_string> descriptions;
for(size_t i = 0; i != NumModificationTypes; ++i) {
const std::string& mod = ModificationTypes[i];
const config::child_list& mods = modifications_.get_children(mod);
for(config::child_list::const_iterator j = mods.begin(); j != mods.end(); ++j) {
log_scope("add mod");
add_modification(ModificationTypes[i],**j,true);
const t_string& name = (**j)["name"];
if(name.empty() == false) {
descriptions.push_back(name);
}
}
}
traitsDescription_ = "";
//we want to make sure the description always has a consistent ordering
std::sort(descriptions.begin(),descriptions.end());
for(std::vector<t_string>::const_iterator j = descriptions.begin(); j != descriptions.end(); ++j) {
if(j != descriptions.begin()) {
std::vector< t_string > traits;
config::child_list const &mods = modifications_.get_children("trait");
for(config::child_list::const_iterator j = mods.begin(), j_end = mods.end(); j != j_end; ++j) {
t_string const &name = (**j)["name"];
if (!name.empty())
traits.push_back(name);
}
std::vector< t_string >::iterator k = traits.begin(), k_end = traits.end();
if (k != k_end) {
// we want to make sure the traits always have a consistent ordering
std::sort(k, k_end);
for(;;) {
traitsDescription_ += *(k++);
if (k == k_end) break;
traitsDescription_ += ", ";
}
traitsDescription_ += *j;
}
}