From f029fd0f3bb8253a7cb9bfa0f9182619835b4512 Mon Sep 17 00:00:00 2001 From: rubidium42 Date: Mon, 21 Jun 2021 18:31:56 +0200 Subject: [PATCH] Codechange: remove overloading on UpdateServiceInterval One UpdateServiceInterval has two parameters to update the service interval for a vehicle type, the other for all vehicle types at once. Rename the latter to help with function resolution for the introduction of variants. --- src/settings.cpp | 2 +- src/table/settings/company_settings.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/settings.cpp b/src/settings.cpp index dab0fe08cb..b52a00f3af 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -833,7 +833,7 @@ static void UpdateConsists(int32 new_value) } /* Check service intervals of vehicles, newvalue is value of % or day based servicing */ -static void UpdateServiceInterval(int32 new_value) +static void UpdateAllServiceInterval(int32 new_value) { bool update_vehicles; VehicleDefaultSettings *vds; diff --git a/src/table/settings/company_settings.ini b/src/table/settings/company_settings.ini index 469e1aceae..71f99d5a21 100644 --- a/src/table/settings/company_settings.ini +++ b/src/table/settings/company_settings.ini @@ -8,7 +8,7 @@ ; company changes them, it changes for all players. [pre-amble] -static void UpdateServiceInterval(int32 new_value); +static void UpdateAllServiceInterval(int32 new_value); static bool CanUpdateServiceInterval(VehicleType type, int32 &new_value); static void UpdateServiceInterval(VehicleType type, int32 new_value); @@ -77,7 +77,7 @@ var = vehicle.servint_ispercent def = false str = STR_CONFIG_SETTING_SERVINT_ISPERCENT strhelp = STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT -post_cb = UpdateServiceInterval +post_cb = UpdateAllServiceInterval [SDT_VAR] var = vehicle.servint_trains