# HG changeset patch # User rubidium42 # Date 2021-06-21 16:31:56 # Node ID 32cd6020de0f531b9cd6d0354f0d79306a4c92c9 # Parent 96b4fe65dab7263bc1494214ab28e2bfb727bf5c 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. diff --git a/src/settings.cpp b/src/settings.cpp --- a/src/settings.cpp +++ b/src/settings.cpp @@ -833,7 +833,7 @@ static void UpdateConsists(int32 new_val } /* 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 --- 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