diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-07-04 17:33:40 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-07-04 17:33:40 +0200 |
| commit | 88dd4ab93ca80cd677528e15043e8b6121c05562 (patch) | |
| tree | 2933b65a98ef0a4b32c4bd848ecdad574bc1cfde /extension/src/openvic-extension/singletons/MenuSingleton.cpp | |
| parent | 6797e64ce8179635d56b73b5b4783eca560cbf11 (diff) | |
| parent | 99a85d03de5297f2c7c29aedfc83e4e37cbc795b (diff) | |
Merge pull request #236 from OpenVicProject/country-definition
Use CountryDefinition and CountryInstance
Diffstat (limited to 'extension/src/openvic-extension/singletons/MenuSingleton.cpp')
| -rw-r--r-- | extension/src/openvic-extension/singletons/MenuSingleton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.cpp b/extension/src/openvic-extension/singletons/MenuSingleton.cpp index 79998d7..b4baf40 100644 --- a/extension/src/openvic-extension/singletons/MenuSingleton.cpp +++ b/extension/src/openvic-extension/singletons/MenuSingleton.cpp @@ -207,7 +207,7 @@ Dictionary MenuSingleton::get_province_info_from_index(int32_t index) const { ret[province_info_life_rating_key] = province->get_life_rating(); - Country const* controller = province->get_controller(); + CountryDefinition const* controller = province->get_controller(); if (controller != nullptr) { ret[province_info_controller_key] = std_view_to_godot_string(controller->get_identifier()); } @@ -241,7 +241,7 @@ Dictionary MenuSingleton::get_province_info_from_index(int32_t index) const { ret[province_info_pop_cultures_key] = GFXPieChartTexture::distribution_to_slices_array(cultures); } - std::vector<Country const*> const& cores = province->get_cores(); + std::vector<CountryDefinition const*> const& cores = province->get_cores(); if (!cores.empty()) { PackedStringArray cores_array; if (cores_array.resize(cores.size()) == OK) { |