diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-11-22 23:11:42 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-11-22 23:11:42 +0100 |
| commit | a54898b7770e0d66b729216173960686c67e58bb (patch) | |
| tree | af8ed836a4789ef94c5bfed27abb713922f45af3 /src/openvic-simulation/country/Country.hpp | |
| parent | e76336cd92639f4ec71088fc4c80aea4c25528cd (diff) | |
| parent | 738a203e0d8b4df87c42888043b99c13d5d97511 (diff) | |
Merge pull request #78 from OpenVicProject/property-macro
Refactoring (*mostly* related to the property macro)
Diffstat (limited to 'src/openvic-simulation/country/Country.hpp')
| -rw-r--r-- | src/openvic-simulation/country/Country.hpp | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/src/openvic-simulation/country/Country.hpp b/src/openvic-simulation/country/Country.hpp index db1e40b..5b5c528 100644 --- a/src/openvic-simulation/country/Country.hpp +++ b/src/openvic-simulation/country/Country.hpp @@ -32,10 +32,10 @@ namespace OpenVic { using policy_map_t = std::map<IssueGroup const*, Issue const*>; private: - const Date start_date; - const Date end_date; - Ideology const& ideology; - const policy_map_t policies; + const Date PROPERTY(start_date); + const Date PROPERTY(end_date); + Ideology const& PROPERTY(ideology); + const policy_map_t PROPERTY(policies); CountryParty( std::string_view new_identifier, Date new_start_date, Date new_end_date, Ideology const& new_ideology, @@ -44,11 +44,6 @@ namespace OpenVic { public: CountryParty(CountryParty&&) = default; - - Date get_start_date() const; - Date get_end_date() const; - Ideology const& get_ideology() const; - policy_map_t const& get_policies() const; }; /* Generic information about a TAG */ @@ -59,14 +54,14 @@ namespace OpenVic { using government_colour_map_t = std::map<GovernmentType const*, colour_t>; private: - GraphicalCultureType const& graphical_culture; + GraphicalCultureType const& PROPERTY(graphical_culture); /* Not const to allow elements to be moved, otherwise a copy is forced * which causes a compile error as the copy constructor has been deleted. */ IdentifierRegistry<CountryParty> parties; - const unit_names_map_t unit_names; - const bool dynamic_tag; - const government_colour_map_t alternative_colours; + const unit_names_map_t PROPERTY(unit_names); + const bool PROPERTY_CUSTOM_NAME(dynamic_tag, is_dynamic_tag); + const government_colour_map_t PROPERTY(alternative_colours); Country( std::string_view new_identifier, colour_t new_colour, GraphicalCultureType const& new_graphical_culture, @@ -78,11 +73,6 @@ namespace OpenVic { Country(Country&&) = default; IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(party, parties) - - GraphicalCultureType const& get_graphical_culture() const; - unit_names_map_t const& get_unit_names() const; - bool is_dynamic_tag() const; - government_colour_map_t const& get_alternative_colours() const; }; struct CountryManager { |