diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-07-26 22:17:43 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-07-26 22:17:43 +0200 |
| commit | f61760e725de0ae4878580a93bcd8ce456aa539f (patch) | |
| tree | bbf41f999d630df44ac2327c302290fb10d819f4 /extension/src/openvic-extension/singletons/MenuSingleton.cpp | |
| parent | 7dfb935447708cfdff664603eadafcbb4aa24042 (diff) | |
| parent | 7c5de8f8d8fc7a9b861f23a4c1a249fb00e88b99 (diff) | |
Merge pull request #244 from OpenVicProject/country-instance
Update openvic-simulation to OpenVicProject/OpenVicSimulation@861acff
Diffstat (limited to 'extension/src/openvic-extension/singletons/MenuSingleton.cpp')
| -rw-r--r-- | extension/src/openvic-extension/singletons/MenuSingleton.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.cpp b/extension/src/openvic-extension/singletons/MenuSingleton.cpp index 36e5f58..8d3de60 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(); - CountryDefinition const* controller = province->get_controller(); + CountryInstance const* controller = province->get_controller(); if (controller != nullptr) { ret[province_info_controller_key] = std_view_to_godot_string(controller->get_identifier()); } @@ -244,12 +244,12 @@ Dictionary MenuSingleton::get_province_info_from_index(int32_t index) const { ret[province_info_pop_cultures_key] = std::move(cultures); } - std::vector<CountryDefinition const*> const& cores = province->get_cores(); + ordered_set<CountryInstance*> const& cores = province->get_cores(); if (!cores.empty()) { PackedStringArray cores_array; if (cores_array.resize(cores.size()) == OK) { for (size_t idx = 0; idx < cores.size(); ++idx) { - cores_array[idx] = std_view_to_godot_string(cores[idx]->get_identifier()); + cores_array[idx] = std_view_to_godot_string(cores.data()[idx]->get_identifier()); } ret[province_info_cores_key] = std::move(cores_array); } else { |