Skip to content

Commit

Permalink
Help: fixed ambiguous overload, config copying
Browse files Browse the repository at this point in the history
  • Loading branch information
Vultraz authored and CelticMinstrel committed Oct 24, 2018
1 parent 116edad commit 5d69e6c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/help/topic_generators.cpp
Expand Up @@ -212,10 +212,10 @@ topic_list generate_time_of_day_topics(const bool /*sort_generated*/)
topic_list generate_trait_topics(const bool sort_generated)
{
topic_list topics;
std::map<t_string, const config> trait_list;
std::map<t_string, const config*> trait_list;

for(const config& trait : unit_types.traits()) {
trait_list.emplace(trait["id"], trait);
trait_list.emplace(trait["id"].t_str(), &trait);
}

for(const auto& i : unit_types.types()) {
Expand All @@ -224,21 +224,21 @@ topic_list generate_trait_topics(const bool sort_generated)
if(description_type(type) == FULL_DESCRIPTION) {
if(auto traits = type.possible_traits()) {
for(const config& trait : traits) {
trait_list.emplace(trait["id"], trait);
trait_list.emplace(trait["id"].t_str(), &trait);
}
}

if(const unit_race* r = unit_types.find_race(type.race_id())) {
for(const config& trait : r->additional_traits()) {
trait_list.emplace(trait["id"], trait);
trait_list.emplace(trait["id"],t_str(), &trait);
}
}
}
}

for(auto& a : trait_list) {
const std::string id = trait_prefix + a.first;
const config& trait = a.second;
const config& trait = *a.second;

std::string name = trait["male_name"].str();
if(name.empty()) {
Expand Down

0 comments on commit 5d69e6c

Please sign in to comment.