From 31a3be4978cc32878a4d41bbffa4e511ff840f72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 4 Jan 2026 15:08:26 +0000 Subject: [PATCH] Bump extension/deps/openvic-simulation from `55c064f` to `90c095f` Bumps [extension/deps/openvic-simulation](https://github.com/OpenVicProject/OpenVic-Simulation) from `55c064f` to `90c095f`. - [Commits](https://github.com/OpenVicProject/OpenVic-Simulation/compare/55c064fe02246e0e246f09f2ea39c0b86f20ac06...90c095feaff9a90f1a4b9eda5bab335c21c7b9da) --- updated-dependencies: - dependency-name: extension/deps/openvic-simulation dependency-version: 90c095feaff9a90f1a4b9eda5bab335c21c7b9da dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- extension/deps/openvic-simulation | 2 +- .../src/openvic-extension/classes/GUIScrollbar.cpp | 2 +- .../components/overview/ScoreOverview.cpp | 2 +- .../openvic-extension/singletons/MenuSingleton.cpp | 2 +- .../openvic-extension/singletons/MilitaryMenu.cpp | 12 ++++++------ .../openvic-extension/singletons/PopulationMenu.cpp | 2 +- .../src/openvic-extension/singletons/TradeMenu.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation index 55c064fe..90c095fe 160000 --- a/extension/deps/openvic-simulation +++ b/extension/deps/openvic-simulation @@ -1 +1 @@ -Subproject commit 55c064fe02246e0e246f09f2ea39c0b86f20ac06 +Subproject commit 90c095feaff9a90f1a4b9eda5bab335c21c7b9da diff --git a/extension/src/openvic-extension/classes/GUIScrollbar.cpp b/extension/src/openvic-extension/classes/GUIScrollbar.cpp index da4daabf..f0e65659 100644 --- a/extension/src/openvic-extension/classes/GUIScrollbar.cpp +++ b/extension/src/openvic-extension/classes/GUIScrollbar.cpp @@ -116,7 +116,7 @@ int32_t GUIScrollbar::_fp_to_value(const fixed_point_t val) const { } fixed_point_t GUIScrollbar::_get_scaled_value(const int32_t val) const { - return offset + fixed_point_t::parse(val) * scale_numerator / scale_denominator; + return offset + fixed_point_t(val) * scale_numerator / scale_denominator; } void GUIScrollbar::_calculate_rects() { diff --git a/extension/src/openvic-extension/components/overview/ScoreOverview.cpp b/extension/src/openvic-extension/components/overview/ScoreOverview.cpp index c3293a24..6a4ceeb7 100644 --- a/extension/src/openvic-extension/components/overview/ScoreOverview.cpp +++ b/extension/src/openvic-extension/components/overview/ScoreOverview.cpp @@ -140,7 +140,7 @@ void ScoreOverview::update() { //TODO get data from sim const long available_colonial_power = 123; - const long colonial_power_from_technology = 200; + const int32_t colonial_power_from_technology = 200; const fixed_point_t colonial_power_invested = 60; const fixed_point_t colonial_power_maintenance = 40; diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.cpp b/extension/src/openvic-extension/singletons/MenuSingleton.cpp index 40a291db..0569be78 100644 --- a/extension/src/openvic-extension/singletons/MenuSingleton.cpp +++ b/extension/src/openvic-extension/singletons/MenuSingleton.cpp @@ -635,7 +635,7 @@ Dictionary MenuSingleton::get_province_info_from_number(int32_t province_number) } const fixed_point_t effect_multiplier = job.get_effect_multiplier(); - fixed_point_t relative_to_workforce = fixed_point_t::parse(employees_of_type) / max_employee_count; + fixed_point_t relative_to_workforce = fixed_point_t(employees_of_type) / max_employee_count; const fixed_point_t effect_value = effect_multiplier == fixed_point_t::_1 ? relative_to_workforce : effect_multiplier * std::min(relative_to_workforce, job.get_amount()); diff --git a/extension/src/openvic-extension/singletons/MilitaryMenu.cpp b/extension/src/openvic-extension/singletons/MilitaryMenu.cpp index 46d195ae..ad220150 100644 --- a/extension/src/openvic-extension/singletons/MilitaryMenu.cpp +++ b/extension/src/openvic-extension/singletons/MilitaryMenu.cpp @@ -310,16 +310,16 @@ Dictionary MenuSingleton::make_in_progress_unit_dict() const { const ordered_map> required_goods { { good_definition_manager.get_good_definition_by_index(good_index_t(0)), - { fixed_point_t::parse(1234) / 100, fixed_point_t::parse(1900) / 100 } + { fixed_point_t(1234) / 100, fixed_point_t(1900) / 100 } }, { good_definition_manager.get_good_definition_by_index(good_index_t(1)), - { fixed_point_t::parse(888) / 100, fixed_point_t::parse(1444) / 100 } + { fixed_point_t(888) / 100, fixed_point_t(1444) / 100 } }, { good_definition_manager.get_good_definition_by_index(good_index_t(2)), - { fixed_point_t::parse(1622) / 100, fixed_point_t::parse(1622) / 100 } + { fixed_point_t(1622) / 100, fixed_point_t(1622) / 100 } }, { good_definition_manager.get_good_definition_by_index(good_index_t(3)), - { fixed_point_t::parse(211) / 100, fixed_point_t::parse(805) / 100 } + { fixed_point_t(211) / 100, fixed_point_t(805) / 100 } } }; @@ -483,12 +483,12 @@ Dictionary MenuSingleton::get_military_menu_info() { *country, *modifier_effect_cache.get_unit_recruitment_time() ); - ret[military_info_combat_width_key] = country->get_combat_width(); + ret[military_info_combat_width_key] = type_safe::get(country->get_combat_width()); { static const StringName base_value_combat_width_localisation_key = "COMWID_BASE"; String combat_width_tooltip = tr(base_value_combat_width_localisation_key).replace( Utilities::get_short_value_placeholder(), String::num_uint64( - definition_manager.get_define_manager().get_military_defines().get_base_combat_width() + type_safe::get(definition_manager.get_define_manager().get_military_defines().get_base_combat_width()) ) ); const fixed_point_t combat_width = country->get_modifier_effect_value( diff --git a/extension/src/openvic-extension/singletons/PopulationMenu.cpp b/extension/src/openvic-extension/singletons/PopulationMenu.cpp index 61075a26..a938dbd4 100644 --- a/extension/src/openvic-extension/singletons/PopulationMenu.cpp +++ b/extension/src/openvic-extension/singletons/PopulationMenu.cpp @@ -403,7 +403,7 @@ Error MenuSingleton::_population_menu_update_filtered_pops() { } for (Pop const* pop : population_menu.filtered_pops) { - const fixed_point_t pop_size = fixed_point_t::parse(pop->get_size()); + const fixed_point_t pop_size = fixed_point_t(pop->get_size()); population_menu.workforce_distribution[pop->get_type()] += pop_size; population_menu.religion_distribution[&pop->religion] += pop_size; diff --git a/extension/src/openvic-extension/singletons/TradeMenu.cpp b/extension/src/openvic-extension/singletons/TradeMenu.cpp index 7ccdd8bd..dace1957 100644 --- a/extension/src/openvic-extension/singletons/TradeMenu.cpp +++ b/extension/src/openvic-extension/singletons/TradeMenu.cpp @@ -229,7 +229,7 @@ Dictionary MenuSingleton::get_trade_menu_tables_info() const { top_producer_template_string, convert_to(country->get_identifier()), Utilities::get_country_name(*this, *country), - Utilities::fixed_point_to_string_dp(fixed_point_t::parse(1000) / static_cast(index + 1), 2) + Utilities::fixed_point_to_string_dp(fixed_point_t(1000) / static_cast(index + 1), 2) ); }