diff --git a/src/lang/english.txt b/src/lang/english.txt index 01d86510c5..7f75fc5bdb 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1811,8 +1811,8 @@ STR_CONFIG_SETTING_NOSERVICE :Disable servici STR_CONFIG_SETTING_NOSERVICE_HELPTEXT :When enabled, vehicles do not get serviced if they cannot break down STR_CONFIG_SETTING_WAGONSPEEDLIMITS :Enable wagon speed limits: {STRING2} STR_CONFIG_SETTING_WAGONSPEEDLIMITS_HELPTEXT :When enabled, also use speed limits of wagons for deciding the maximum speed of a train -STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTION :Enable train speed adaption: {STRING2} -STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTION_HELPTEXT :If enabled, faster trains behind slower trains adjust their speed. +STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTATION :Enable train speed adaptation: {STRING2} +STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTATION_HELPTEXT :When enabled, faster trains adjust their speed to match slower trains in front. STR_CONFIG_SETTING_SLOW_ROAD_VEHICLES_IN_CURVES :Road vehicles slow down in curves: {STRING2} STR_CONFIG_SETTING_SLOW_ROAD_VEHICLES_IN_CURVES_HELPTEXT :When enabled, road vehicles slow down in curves. (Only with realistic acceleration) STR_CONFIG_SETTING_DISABLE_ELRAILS :Disable electric rails: {STRING2} diff --git a/src/lang/german.txt b/src/lang/german.txt index 7c1ba02162..014fd75f1b 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1737,8 +1737,8 @@ STR_CONFIG_SETTING_NOSERVICE :Wartung deaktiv STR_CONFIG_SETTING_NOSERVICE_HELPTEXT :Schicke Fahrzeuge nicht zur Wartung, wenn Pannen ausgeschaltet sind STR_CONFIG_SETTING_WAGONSPEEDLIMITS :Berücksichtige Waggonhöchstgeschwindigkeit: {STRING} STR_CONFIG_SETTING_WAGONSPEEDLIMITS_HELPTEXT :Begrenze die Höchstgeschwindigkeit eines Zuges durch die jeweiligen Höchstgeschwindigkeiten der mitgeführten Waggons -STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTION :Zuggeschwindigkeitsanpassung aktivieren: {STRING} -STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTION_HELPTEXT :Wenn aktiviert, passen schnellere Züge hinter langsameren Zügen ihre Geschwindigkeit an. +STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTATION :Zuggeschwindigkeitsanpassung aktivieren: {STRING} +STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTATION_HELPTEXT :Wenn aktiviert, passen schnellere Züge hinter langsameren Zügen ihre Geschwindigkeit an. STR_CONFIG_SETTING_SLOW_ROAD_VEHICLES_IN_CURVES :Straßenfahrzeuge werden in Kurven langsamer: {STRING} STR_CONFIG_SETTING_SLOW_ROAD_VEHICLES_IN_CURVES_HELPTEXT :Wenn aktiviert, verlangsamen Straßenfahrzeuge in Kurven. (Nur im Beschleunigungsmodell „Realistisch“) STR_CONFIG_SETTING_DISABLE_ELRAILS :Deaktiviere elektrifizierte Strecken: {STRING} diff --git a/src/settings.cpp b/src/settings.cpp index 64110c8523..8037788f3e 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1541,7 +1541,7 @@ static bool PublicRoadsSettingChange(int32 p1) { return true; } -static bool TrainSpeedAdaptionChanged(int32 p1) { +static bool TrainSpeedAdaptationChanged(int32 p1) { extern void ClearAllSignalSpeedRestrictions(); ClearAllSignalSpeedRestrictions(); for (Train *t : Train::Iterate()) { diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 179a12e642..302ef2c806 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1923,7 +1923,7 @@ static SettingsContainer &GetSettingsTree() physics->Add(new SettingEntry("vehicle.train_braking_model")); physics->Add(new SettingEntry("vehicle.train_slope_steepness")); physics->Add(new SettingEntry("vehicle.wagon_speed_limits")); - physics->Add(new SettingEntry("vehicle.train_speed_adaption")); + physics->Add(new SettingEntry("vehicle.train_speed_adaptation")); physics->Add(new SettingEntry("vehicle.freight_trains")); physics->Add(new SettingEntry("vehicle.roadveh_acceleration_model")); physics->Add(new SettingEntry("vehicle.roadveh_slope_steepness")); diff --git a/src/settings_type.h b/src/settings_type.h index 95fbe4b1f8..4e8dbb92d4 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -572,7 +572,7 @@ struct VehicleSettings { uint8 train_slope_steepness; ///< Steepness of hills for trains when using realistic acceleration uint8 roadveh_slope_steepness; ///< Steepness of hills for road vehicles when using realistic acceleration bool wagon_speed_limits; ///< enable wagon speed limits - bool train_speed_adaption; ///< Faster trains behind slower trains slow down + bool train_speed_adaptation; ///< Faster trains slow down when behind slower trains bool slow_road_vehicles_in_curves; ///< Road vehicles slow down in curves. bool disable_elrails; ///< when true, the elrails are disabled UnitID max_trains; ///< max trains in game per company diff --git a/src/table/settings.ini b/src/table/settings.ini index 85faa7459f..f9797b1e15 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -64,7 +64,7 @@ static bool ClimateThresholdModeChanged(int32 p1); static bool VelocityUnitsChanged(int32 p1); static bool ChangeTrackTypeSortMode(int32 p1); static bool PublicRoadsSettingChange(int32 p1); -static bool TrainSpeedAdaptionChanged(int32 p1); +static bool TrainSpeedAdaptationChanged(int32 p1); static bool UpdateClientName(int32 p1); static bool UpdateServerPassword(int32 p1); @@ -1676,20 +1676,19 @@ strhelp = STR_CONFIG_SETTING_SLOW_ROAD_VEHICLES_IN_CURVES_HELPTEXT cat = SC_BASIC patxname = ""slow_road_vehicles_in_curves.vehicle.slow_road_vehicles_in_curves"" -;; vehicle.train_speed_adaption [SDT_XREF] extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP) -xref = ""vehicle.train_speed_adaption"" +xref = ""vehicle.train_speed_adaptation"" [SDT_BOOL] base = GameSettings -var = vehicle.train_speed_adaption +var = vehicle.train_speed_adaptation def = true -str = STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTION -strhelp = STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTION_HELPTEXT +str = STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTATION +strhelp = STR_CONFIG_SETTING_TRAIN_SPEED_ADAPTATION_HELPTEXT cat = SC_EXPERT -proc = TrainSpeedAdaptionChanged -patxname = ""train_speed_adaption.vehicle.train_speed_adaption"" +proc = TrainSpeedAdaptationChanged +patxname = ""train_speed_adaptation.vehicle.train_speed_adaptation"" [SDT_BOOL] base = GameSettings diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 94faf2e5ef..4976412f9d 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1047,7 +1047,7 @@ Train::MaxSpeedInfo Train::GetCurrentMaxSpeedInfoInternal(bool update_state) con this->gcache.cached_max_track_speed : std::min(this->tcache.cached_max_curve_speed, this->gcache.cached_max_track_speed); - if (_settings_game.vehicle.train_speed_adaption) max_speed = std::min(max_speed, GetAtcMaxSpeed()); + if (_settings_game.vehicle.train_speed_adaptation) max_speed = std::min(max_speed, GetAtcMaxSpeed()); if (this->current_order.IsType(OT_LOADING_ADVANCE)) max_speed = std::min(max_speed, 15); @@ -5592,7 +5592,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) if (update_signals_crossing) { if (v->IsFrontEngine()) { - if (_settings_game.vehicle.train_speed_adaption && IsTileType(gp.old_tile, MP_RAILWAY) && HasSignals(gp.old_tile)) { + if (_settings_game.vehicle.train_speed_adaptation && IsTileType(gp.old_tile, MP_RAILWAY) && HasSignals(gp.old_tile)) { const TrackdirBits rev_tracks = TrackBitsToTrackdirBits(GetTrackBits(gp.old_tile)) & DiagdirReachesTrackdirs(ReverseDiagDir(enterdir)); const Trackdir rev_trackdir = FindFirstTrackdir(rev_tracks); const Track track = TrackdirToTrack(rev_trackdir); @@ -5658,7 +5658,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) const Track track = TrackdirToTrack(rev_trackdir); if (HasSignalOnTrack(gp.old_tile, track)) { - if (_settings_game.vehicle.train_speed_adaption) { + if (_settings_game.vehicle.train_speed_adaptation) { SignalSpeedKey speed_key = { speed_key.signal_tile = gp.old_tile, speed_key.signal_track = track,