From 7c5de8f8d8fc7a9b861f23a4c1a249fb00e88b99 Mon Sep 17 00:00:00 2001 From: hop311 Date: Thu, 4 Jul 2024 18:20:38 +0100 Subject: Update openvic-simulation to OpenVicProject/OpenVicSimulation@861acff --- extension/src/openvic-extension/singletons/MenuSingleton.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extension/src/openvic-extension/singletons/MenuSingleton.cpp') 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 const& cores = province->get_cores(); + ordered_set 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 { -- cgit v1.2.3-56-ga3b1