summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium42 <rubidium@openttd.org>2021-06-21 18:31:56 +0200
committerPatric Stout <github@truebrain.nl>2021-06-26 20:28:34 +0200
commitf029fd0f3bb8253a7cb9bfa0f9182619835b4512 (patch)
tree31b5930953df4f0f8ebf674a0b804f856e8ce4da
parentcdf9caf8eae152d81ef17ed6c7f56e52d07dbe3f (diff)
downloadopenttd-f029fd0f3bb8253a7cb9bfa0f9182619835b4512.tar.xz
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.
-rw-r--r--src/settings.cpp2
-rw-r--r--src/table/settings/company_settings.ini4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index dab0fe08c..b52a00f3a 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 469e1acea..71f99d5a2 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