From 5d69e6c03ce5c6ca2af9cd6b6d17dacc38914010 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Tue, 3 Apr 2018 13:09:00 +1100 Subject: [PATCH] Help: fixed ambiguous overload, config copying --- src/help/topic_generators.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/help/topic_generators.cpp b/src/help/topic_generators.cpp index d957aefbdd41..bb3b97fe5e5f 100644 --- a/src/help/topic_generators.cpp +++ b/src/help/topic_generators.cpp @@ -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 trait_list; + std::map 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()) { @@ -224,13 +224,13 @@ 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); } } } @@ -238,7 +238,7 @@ topic_list generate_trait_topics(const bool sort_generated) 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()) {