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

Only call add_trait_description if the trait actually has a description.

Browse source 
Otherwise we crash on windows for undescribed traits.
This commit is contained in:
Jody Northup 2011-04-15 23:03:01 +00:00
parent 809a85151d
commit c7058c03b2
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/unit.cpp
View file

@ -2588,22 +2588,22 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
const t_string& mod_description = mod["description"];
if (!mod_description.empty()) {
description = mod_description + " ";
}
// Punctuation should be translatable: not all languages use latin punctuation.
// (However, there maybe is a better way to do it)
if(effects_description.empty() == false) {
for(std::vector<t_string>::const_iterator i = effects_description.begin();
i != effects_description.end(); ++i) {
description += *i;
if(i+1 != effects_description.end())
description += t_string(N_(" and "), "wesnoth");
// Punctuation should be translatable: not all languages use latin punctuation.
// (However, there maybe is a better way to do it)
if(effects_description.empty() == false) {
for(std::vector<t_string>::const_iterator i = effects_description.begin();
i != effects_description.end(); ++i) {
description += *i;
if(i+1 != effects_description.end())
description += t_string(N_(" and "), "wesnoth");
}
}
}
// store trait info
if(type == "trait") {
add_trait_description(mod, description);
// store trait info
if(type == "trait") {
add_trait_description(mod, description);
}
}
//NOTE: if not a trait, description is currently not used