diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-07-17 14:01:19 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-07-17 14:01:19 +0200 |
| commit | 2d111ea003e975ea1adbcd7e4d903f760f1daa07 (patch) | |
| tree | fae6a1086f3ae698c4fb3f18340c5ed5f580c889 /src/openvic-simulation/map/MapInstance.hpp | |
| parent | e8a3b33f13ebdf3a388b4996308b4db9763dc375 (diff) | |
| parent | f83e869def6608f64606aead24ad1cfbb6f5c72a (diff) | |
Merge pull request #174 from OpenVicProject/indexed-map
Add IndexedMap and use in low key count, high value density cases
Diffstat (limited to 'src/openvic-simulation/map/MapInstance.hpp')
| -rw-r--r-- | src/openvic-simulation/map/MapInstance.hpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/openvic-simulation/map/MapInstance.hpp b/src/openvic-simulation/map/MapInstance.hpp index 2c0ff74..00bd638 100644 --- a/src/openvic-simulation/map/MapInstance.hpp +++ b/src/openvic-simulation/map/MapInstance.hpp @@ -10,9 +10,7 @@ namespace OpenVic { struct MapDefinition; struct BuildingTypeManager; struct ProvinceHistoryManager; - struct IdeologyManager; struct IssueManager; - struct CountryDefinition; /* REQUIREMENTS: * MAP-4 @@ -44,10 +42,13 @@ namespace OpenVic { ProvinceInstance* get_selected_province(); ProvinceDefinition::index_t get_selected_province_index() const; - bool setup(BuildingTypeManager const& building_type_manager); + bool setup( + BuildingTypeManager const& building_type_manager, + decltype(ProvinceInstance::pop_type_distribution)::keys_t const& pop_type_keys, + decltype(ProvinceInstance::ideology_distribution)::keys_t const& ideology_keys + ); bool apply_history_to_provinces( - ProvinceHistoryManager const& history_manager, Date date, IdeologyManager const& ideology_manager, - IssueManager const& issue_manager, CountryDefinition const& country + ProvinceHistoryManager const& history_manager, Date date, IssueManager const& issue_manager ); void update_gamestate(Date today); |