diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-07-23 19:47:47 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-07-23 19:47:47 +0200 |
| commit | 6cd55c452d1643666ff4169a89402fd3e3b66c61 (patch) | |
| tree | 888b847a54c66b6e9d1b2f7ee3e3d0f8071eceda /src/openvic-simulation/history/CountryHistory.hpp | |
| parent | 9d57ca273e4b32ab82a51789ec58e08fefb5276a (diff) | |
| parent | 67cbd14630c4344902d3fa1ddca178809da4293b (diff) | |
Merge pull request #177 from OpenVicProject/country-instance
Fleshing out Country, State and Province instances + history
Diffstat (limited to 'src/openvic-simulation/history/CountryHistory.hpp')
| -rw-r--r-- | src/openvic-simulation/history/CountryHistory.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/history/CountryHistory.hpp b/src/openvic-simulation/history/CountryHistory.hpp index c74841d..d6a6997 100644 --- a/src/openvic-simulation/history/CountryHistory.hpp +++ b/src/openvic-simulation/history/CountryHistory.hpp @@ -32,7 +32,7 @@ namespace OpenVic { CountryDefinition const& PROPERTY(country); std::optional<Culture const*> PROPERTY(primary_culture); - std::vector<Culture const*> PROPERTY(accepted_cultures); + ordered_set<Culture const*> PROPERTY(accepted_cultures); std::optional<Religion const*> PROPERTY(religion); std::optional<CountryParty const*> PROPERTY(ruling_party); std::optional<Date> PROPERTY(last_election); @@ -43,7 +43,7 @@ namespace OpenVic { std::optional<NationalValue const*> PROPERTY(national_value); std::optional<bool> PROPERTY_CUSTOM_PREFIX(civilised, is); std::optional<fixed_point_t> PROPERTY(prestige); - std::vector<Reform const*> PROPERTY(reforms); + ordered_set<Reform const*> PROPERTY(reforms); std::optional<Deployment const*> PROPERTY(inital_oob); std::optional<TechnologySchool const*> PROPERTY(tech_school); ordered_map<Technology const*, bool> PROPERTY(technologies); |