diff options
Diffstat (limited to 'src/openvic-simulation/pop/Culture.hpp')
| -rw-r--r-- | src/openvic-simulation/pop/Culture.hpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/openvic-simulation/pop/Culture.hpp b/src/openvic-simulation/pop/Culture.hpp index 2abe77d..ff5f7c5 100644 --- a/src/openvic-simulation/pop/Culture.hpp +++ b/src/openvic-simulation/pop/Culture.hpp @@ -20,9 +20,9 @@ namespace OpenVic { friend struct CultureManager; private: - const std::string leader; - GraphicalCultureType const& unit_graphical_culture_type; - const bool is_overseas; + const std::string PROPERTY(leader); + GraphicalCultureType const& PROPERTY(unit_graphical_culture_type); + const bool PROPERTY(is_overseas); // TODO - union tag @@ -33,18 +33,15 @@ namespace OpenVic { public: CultureGroup(CultureGroup&&) = default; - - std::string_view get_leader() const; - GraphicalCultureType const& get_unit_graphical_culture_type() const; - bool get_is_overseas() const; }; struct Culture : HasIdentifierAndColour { friend struct CultureManager; private: - CultureGroup const& group; - const std::vector<std::string> first_names, last_names; + CultureGroup const& PROPERTY(group); + const std::vector<std::string> PROPERTY(first_names); + const std::vector<std::string> PROPERTY(last_names); // TODO - radicalism, primary tag @@ -55,10 +52,6 @@ namespace OpenVic { public: Culture(Culture&&) = default; - - CultureGroup const& get_group() const; - std::vector<std::string> const& get_first_names() const; - std::vector<std::string> const& get_last_names() const; }; struct CultureManager { |