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

Help: Use female_name and name as fallback when male_name is empty and don't list hidden traits.

Browse source 
This algorithm was lifted from help::generate_trait_topics().

Fixes #3284

(cherry-picked from commit a4b0de5ece)
This commit is contained in:
josteph 2018-06-27 10:18:03 +00:00 • committed by Charles Dang
parent 613ea51823
commit cb88a7a232
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/help/help_topic_generators.cpp
View file

@ -215,6 +215,7 @@ std::string terrain_topic_generator::operator()() const {
//Typedef to help with formatting list of traits
// Maps localized trait name to trait help topic ID
typedef std::pair<std::string, std::string> trait_data;
//Helper function for printing a list of trait data
@ -393,8 +394,12 @@ std::string unit_topic_generator::operator()() const {
std::vector<trait_data> random_traits;
int must_have_nameless_traits = 0;
for (const config & trait : traits) {
const std::string trait_name = trait["male_name"];
for(const config& trait : traits) {
std::string trait_name = trait["male_name"].str();
if (trait_name.empty()) trait_name = trait["female_name"].str();
if (trait_name.empty()) trait_name = trait["name"].str();
if (trait_name.empty()) continue; // Hidden trait
std::string lang_trait_name = translation::gettext(trait_name.c_str());
if (lang_trait_name.empty() && trait["availability"].str() == "musthave") {
++must_have_nameless_traits;