diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-12-13 21:09:27 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-13 21:09:27 +0100 |
| commit | e79ad08e28c07bac5d28d0653cbe374cd51e6bbe (patch) | |
| tree | 4dbbbc2c10b8bbc6670b36f3d4ecd4d5f7e765f9 /src/openvic-simulation/history/CountryHistory.hpp | |
| parent | ce45aaae79199e07f9249799884cbba1b3d581eb (diff) | |
| parent | 89c93f98b865c20cd3c3486a9b91323565e759fc (diff) | |
Merge pull request #89 from OpenVicProject/dataloading-pop-history
Pop History Loading (with the new system)
Diffstat (limited to 'src/openvic-simulation/history/CountryHistory.hpp')
| -rw-r--r-- | src/openvic-simulation/history/CountryHistory.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvic-simulation/history/CountryHistory.hpp b/src/openvic-simulation/history/CountryHistory.hpp index af7d502..106b1c3 100644 --- a/src/openvic-simulation/history/CountryHistory.hpp +++ b/src/openvic-simulation/history/CountryHistory.hpp @@ -3,6 +3,7 @@ #include <map> #include <optional> +#include "openvic-simulation/misc/Decision.hpp" #include "openvic-simulation/country/Country.hpp" #include "openvic-simulation/history/Bookmark.hpp" #include "openvic-simulation/history/HistoryMap.hpp" @@ -54,9 +55,8 @@ namespace OpenVic { std::optional<fixed_point_t> PROPERTY(colonial_points); string_set_t PROPERTY(country_flags); string_set_t PROPERTY(global_flags); - std::map<GovernmentType const*, std::string> PROPERTY(government_flags); - - //TODO: decisions + std::map<GovernmentType const*, GovernmentType const*> PROPERTY(government_flag_overrides); + std::set<Decision const*> decisions; CountryHistoryEntry(Country const& new_country, Date new_date); }; |