diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-10-13 10:16:44 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-10-13 10:16:44 +0200 |
| commit | 32fdf7c38b2e56339a2fffa71a7a61a854759e2c (patch) | |
| tree | 4ad745778dea488ad10509cf17d349c3ef0cc229 /src/openvic-simulation/pop/Culture.hpp | |
| parent | bb22324da1225a0ac458c1d69893bb3bd28bd6b7 (diff) | |
| parent | d95c3c9da75018e3e959e5493ebd9c520e00bf7a (diff) | |
Merge pull request #50 from OpenVicProject/changes
Lots of accumulated changes
Diffstat (limited to 'src/openvic-simulation/pop/Culture.hpp')
| -rw-r--r-- | src/openvic-simulation/pop/Culture.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvic-simulation/pop/Culture.hpp b/src/openvic-simulation/pop/Culture.hpp index becc289..d36a90b 100644 --- a/src/openvic-simulation/pop/Culture.hpp +++ b/src/openvic-simulation/pop/Culture.hpp @@ -31,7 +31,7 @@ namespace OpenVic { public: CultureGroup(CultureGroup&&) = default; - std::string const& get_leader() const; + std::string_view get_leader() const; GraphicalCultureType const& get_unit_graphical_culture_type() const; bool get_is_overseas() const; }; @@ -69,13 +69,13 @@ namespace OpenVic { CultureManager(); bool add_graphical_culture_type(std::string_view identifier); - IDENTIFIER_REGISTRY_ACCESSORS(GraphicalCultureType, graphical_culture_type) + IDENTIFIER_REGISTRY_ACCESSORS(graphical_culture_type) bool add_culture_group(std::string_view identifier, std::string_view leader, GraphicalCultureType const* new_graphical_culture_type, bool is_overseas); - IDENTIFIER_REGISTRY_ACCESSORS(CultureGroup, culture_group) + IDENTIFIER_REGISTRY_ACCESSORS(culture_group) bool add_culture(std::string_view identifier, colour_t colour, CultureGroup const* group, std::vector<std::string> const& first_names, std::vector<std::string> const& last_names); - IDENTIFIER_REGISTRY_ACCESSORS(Culture, culture) + IDENTIFIER_REGISTRY_ACCESSORS(culture) bool load_graphical_culture_type_file(ast::NodeCPtr root); bool load_culture_file(ast::NodeCPtr root); |