diff options
| author |   hop311 <hop3114@gmail.com> | 2024-04-20 23:31:48 +0200 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2024-04-20 23:31:48 +0200 |
| commit | 2d5454c668fc866023c41f07ceed263b2c1ff237 (patch) | |
| tree | 7f74c87115f5f066b81d47f060c75ce6ee6a76dc | |
| parent | acad20f397b818a124890ae18ee59c4be5bd718d (diff) | |
Update openvic-simulation to OpenVicProject/OpenVic-Simulation@d0f8ec5update-sim
| m--------- | extension/deps/openvic-simulation | 0 | ||||
| -rw-r--r-- | extension/src/openvic-extension/singletons/PopulationMenu.cpp | 12 |
2 files changed, 9 insertions, 3 deletions
diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation -Subproject 8f97145e9570a9b728010a818137cb31a51fd5f +Subproject d0f8ec5484a0ea49d778c0ebb6c2ba2e6df9b7d diff --git a/extension/src/openvic-extension/singletons/PopulationMenu.cpp b/extension/src/openvic-extension/singletons/PopulationMenu.cpp index b256e1f..f97cae6 100644 --- a/extension/src/openvic-extension/singletons/PopulationMenu.cpp +++ b/extension/src/openvic-extension/singletons/PopulationMenu.cpp @@ -55,6 +55,9 @@ int32_t MenuSingleton::get_population_menu_province_list_row_count() const { } TypedArray<Dictionary> MenuSingleton::get_population_menu_province_list_rows(int32_t start, int32_t count) const { + // TODO - remove when country population is used instead of total map population + ERR_FAIL_NULL_V(game_manager, {}); + if (population_menu.province_list_entries.empty()) { return {}; } @@ -81,6 +84,9 @@ TypedArray<Dictionary> MenuSingleton::get_population_menu_province_list_rows(int int32_t& start_counter; int32_t& count_counter; + // TODO - remove when country population is used instead of total map population + const Pop::pop_size_t total_map_population; + /* This is the index among all entries, not just visible ones unlike start and count. */ int32_t index = 0; @@ -98,7 +104,7 @@ TypedArray<Dictionary> MenuSingleton::get_population_menu_province_list_rows(int country_dict[type_key] = population_menu_t::LIST_ENTRY_COUNTRY; country_dict[index_key] = index; country_dict[name_key] = std_view_to_godot_string(country_entry.country.get_identifier()); - country_dict[size_key] = 0; + country_dict[size_key] = total_map_population; country_dict[change_key] = 0; country_dict[selected_key] = country_entry.selected; @@ -119,7 +125,7 @@ TypedArray<Dictionary> MenuSingleton::get_population_menu_province_list_rows(int state_dict[type_key] = population_menu_t::LIST_ENTRY_STATE; state_dict[index_key] = index; state_dict[name_key] = std_view_to_godot_string(state_entry.state.get_identifier()); - state_dict[size_key] = 0; + state_dict[size_key] = state_entry.state.calculate_total_population(); state_dict[change_key] = 0; state_dict[selected_key] = state_entry.selected; state_dict[expanded_key] = state_entry.expanded; @@ -151,7 +157,7 @@ TypedArray<Dictionary> MenuSingleton::get_population_menu_province_list_rows(int return true; } - } entry_visitor { start, count }; + } entry_visitor { start, count, game_manager->get_map().get_total_map_population() }; while (entry_visitor.index < population_menu.province_list_entries.size() && std::visit(entry_visitor, population_menu.province_list_entries[entry_visitor.index])) { |