From b59d6eba6a0093d1370e7ebb587e8548eb88f325 Mon Sep 17 00:00:00 2001 From: wvpm <24685035+wvpm@users.noreply.github.com> Date: Tue, 20 Jan 2026 12:48:46 +0100 Subject: [PATCH] Use parse_raw for projected spending --- .../country/CountryInstance.cpp | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/openvic-simulation/country/CountryInstance.cpp b/src/openvic-simulation/country/CountryInstance.cpp index 23cbb7a1..40c29230 100644 --- a/src/openvic-simulation/country/CountryInstance.cpp +++ b/src/openvic-simulation/country/CountryInstance.cpp @@ -1410,25 +1410,21 @@ void CountryInstance::_update_budget() { * calculate_unemployment_subsidies_base(pop_type).get_raw_value(); } - projected_administration_spending_unscaled_by_slider.set(fixed_point_t::from_fraction( - projected_administration_spending_unscaled_by_slider_running_total, - type_safe::get(Pop::size_denominator) + const int64_t denominator = type_safe::get(Pop::size_denominator); + projected_administration_spending_unscaled_by_slider.set(fixed_point_t::parse_raw( + projected_administration_spending_unscaled_by_slider_running_total / denominator )); - projected_education_spending_unscaled_by_slider.set(fixed_point_t::from_fraction( - projected_education_spending_unscaled_by_slider_running_total, - type_safe::get(Pop::size_denominator) + projected_education_spending_unscaled_by_slider.set(fixed_point_t::parse_raw( + projected_education_spending_unscaled_by_slider_running_total / denominator )); - projected_military_spending_unscaled_by_slider.set(fixed_point_t::from_fraction( - projected_military_spending_unscaled_by_slider_running_total, - type_safe::get(Pop::size_denominator) + projected_military_spending_unscaled_by_slider.set(fixed_point_t::parse_raw( + projected_military_spending_unscaled_by_slider_running_total / denominator )); - projected_pensions_spending_unscaled_by_slider.set(fixed_point_t::from_fraction( - projected_pensions_spending_unscaled_by_slider_running_total, - type_safe::get(Pop::size_denominator) + projected_pensions_spending_unscaled_by_slider.set(fixed_point_t::parse_raw( + projected_pensions_spending_unscaled_by_slider_running_total / denominator )); - projected_unemployment_subsidies_spending_unscaled_by_slider.set(fixed_point_t::from_fraction( - projected_unemployment_subsidies_spending_unscaled_by_slider_running_total, - type_safe::get(Pop::size_denominator) + projected_unemployment_subsidies_spending_unscaled_by_slider.set(fixed_point_t::parse_raw( + projected_unemployment_subsidies_spending_unscaled_by_slider_running_total / denominator )); }