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

Allowed the generated description for traits to be turned off

Browse source
This commit is contained in:
Bär Halberkamp 2013-12-04 16:59:38 +01:00
parent 3cce3ae093
commit 4c7f24c319
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/unit.cpp
View file

@ -2342,11 +2342,16 @@ size_t unit::modification_count(const std::string& mod_type, const std::string&
void unit::add_modification(const std::string& mod_type, const config& mod, bool no_add)
{
bool generate_description = true;
//some trait activate specific flags
if ( mod_type == "trait" ) {
const std::string& id = mod["id"];
is_fearless_ = is_fearless_ || id == "fearless";
is_healthy_ = is_healthy_ || id == "healthy";
if (!mod["generate_description"].empty()) {
generate_description = mod["generate_description"];
}
}
config *new_child = NULL;
@ -2718,7 +2723,7 @@ void unit::add_modification(const std::string& mod_type, const config& mod, bool
// 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) {
if(effects_description.empty() == false && generate_description == true) {
for(std::vector<t_string>::const_iterator i = effects_description.begin();
i != effects_description.end(); ++i) {
description += *i;