diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-11-17 10:19:53 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-11-17 10:19:53 +0100 |
| commit | e76336cd92639f4ec71088fc4c80aea4c25528cd (patch) | |
| tree | eeed419a7d97ecb58adf63a17eb9184db3e5ed7a /src/openvic-simulation/pop/Culture.hpp | |
| parent | a00b558a53edb40c9e6789790036f0b618e80ec1 (diff) | |
| parent | 886b8b8f396438fc2b7da7d2508f2064d14150a8 (diff) | |
Merge pull request #75 from OpenVicProject/accumulated-changes
Accumulated changes
Diffstat (limited to 'src/openvic-simulation/pop/Culture.hpp')
| -rw-r--r-- | src/openvic-simulation/pop/Culture.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvic-simulation/pop/Culture.hpp b/src/openvic-simulation/pop/Culture.hpp index 402af0c..2abe77d 100644 --- a/src/openvic-simulation/pop/Culture.hpp +++ b/src/openvic-simulation/pop/Culture.hpp @@ -71,7 +71,7 @@ namespace OpenVic { size_t& total_expected_cultures, GraphicalCultureType const* default_unit_graphical_culture_type, std::string_view culture_group_key, ast::NodeCPtr culture_group_node ); - bool _load_culture(CultureGroup const* culture_group, std::string_view culture_key, ast::NodeCPtr node); + bool _load_culture(CultureGroup const& culture_group, std::string_view culture_key, ast::NodeCPtr node); public: CultureManager(); @@ -80,13 +80,13 @@ namespace OpenVic { IDENTIFIER_REGISTRY_ACCESSORS(graphical_culture_type) bool add_culture_group( - std::string_view identifier, std::string_view leader, GraphicalCultureType const* new_graphical_culture_type, + std::string_view identifier, std::string_view leader, GraphicalCultureType const* graphical_culture_type, bool is_overseas ); IDENTIFIER_REGISTRY_ACCESSORS(culture_group) bool add_culture( - std::string_view identifier, colour_t colour, CultureGroup const* group, std::vector<std::string>&& first_names, + std::string_view identifier, colour_t colour, CultureGroup const& group, std::vector<std::string>&& first_names, std::vector<std::string>&& last_names ); IDENTIFIER_REGISTRY_ACCESSORS(culture) |