aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/country/CountryInstance.hpp
diff options
context:
space:
mode:
author hop311 <hop3114@gmail.com>2024-08-30 00:35:18 +0200
committer hop311 <hop3114@gmail.com>2024-08-30 00:35:18 +0200
commit8d5068c1db9a02a34d675536f41aee61ec3e482a (patch)
tree894e8c0514a572bb4cc64216f40833995660b22d /src/openvic-simulation/country/CountryInstance.hpp
parent172ad2fcc34b567eab9eca1f907cd99574fa031e (diff)
Load government flag overrides from history and apply themgov-flag-type
Diffstat (limited to 'src/openvic-simulation/country/CountryInstance.hpp')
-rw-r--r--src/openvic-simulation/country/CountryInstance.hpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/openvic-simulation/country/CountryInstance.hpp b/src/openvic-simulation/country/CountryInstance.hpp
index 5b26f7f..f4baf2d 100644
--- a/src/openvic-simulation/country/CountryInstance.hpp
+++ b/src/openvic-simulation/country/CountryInstance.hpp
@@ -78,6 +78,8 @@ namespace OpenVic {
IndexedMap<Ideology, fixed_point_t> PROPERTY(upper_house);
std::vector<Reform const*> PROPERTY(reforms); // TODO: should be map of reform groups to active reforms: must set defaults & validate applied history
// TODO - national issue support distribution (for just voters and for everyone)
+ IndexedMap<GovernmentType, GovernmentType const*> PROPERTY(government_flag_overrides);
+ GovernmentType const* PROPERTY(flag_government_type);
fixed_point_t PROPERTY(suppression_points);
fixed_point_t PROPERTY(infamy);
fixed_point_t PROPERTY(plurality);
@@ -127,8 +129,11 @@ namespace OpenVic {
UNIT_BRANCHED_GETTER(get_leaders, generals, admirals);
CountryInstance(
- CountryDefinition const* new_country_definition, decltype(technologies)::keys_t const& technology_keys,
- decltype(inventions)::keys_t const& invention_keys, decltype(upper_house)::keys_t const& ideology_keys,
+ CountryDefinition const* new_country_definition,
+ decltype(technologies)::keys_t const& technology_keys,
+ decltype(inventions)::keys_t const& invention_keys,
+ decltype(upper_house)::keys_t const& ideology_keys,
+ decltype(government_flag_overrides)::keys_t const& government_type_keys,
decltype(pop_type_distribution)::keys_t const& pop_type_keys
);
@@ -198,6 +203,7 @@ namespace OpenVic {
decltype(CountryInstance::technologies)::keys_t const& technology_keys,
decltype(CountryInstance::inventions)::keys_t const& invention_keys,
decltype(CountryInstance::upper_house)::keys_t const& ideology_keys,
+ decltype(CountryInstance::government_flag_overrides)::keys_t const& government_type_keys,
decltype(CountryInstance::pop_type_distribution)::keys_t const& pop_type_keys
);