From 5a8da777450f2940c5adf2de652915de89c3f385 Mon Sep 17 00:00:00 2001 From: Csantucci Date: Mon, 7 Nov 2022 18:23:38 +0100 Subject: [PATCH] Fix typo in cabview control name --- Source/Documentation/Manual/cruisecontrol.rst | 6 ++++-- Source/Orts.Formats.Msts/CabViewFile.cs | 2 +- .../Simulation/RollingStocks/SubSystems/CruiseControl.cs | 2 +- .../Viewer3D/RollingStock/MSTSLocomotiveViewer.cs | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Source/Documentation/Manual/cruisecontrol.rst b/Source/Documentation/Manual/cruisecontrol.rst index ad1ad9f233..7dfdc0b1d4 100644 --- a/Source/Documentation/Manual/cruisecontrol.rst +++ b/Source/Documentation/Manual/cruisecontrol.rst @@ -283,7 +283,9 @@ Cruise Control Cabview Controls =============================== The list of the available cabview controls may be found in the -table here below. +table here below. Please note that spaces within cabview control +names are there only for table display purposes, and must not be +entered in the .cvf files. .. csv-table:: Cabview Controls :header: "Control Name", "Description", "UoM", "Mouse activated" @@ -299,7 +301,7 @@ table here below. "ORTS_NUMBER_OF_AXES_DISPLAY_TENS", "See above", "", "ORTS_NUMBER_OF_AXES_DISPLAY_HUNDREDS", "See above", "", "ORTS_TRAIN_LENGTH_METERS", "Displays the train length", "meters", - "ORTS_REMAINING_TRAIN_LENGHT_SPEED _RESTRICTED", "When the restricted speed zone flag is activated, displays the remaining train lenght that hasn't yet arrived at the end of the restricted speed zone. Else shows 0", "meters", + "ORTS_REMAINING_TRAIN_LENGTH_SPEED _RESTRICTED", "When the restricted speed zone flag is activated, displays the remaining train lenght that hasn't yet arrived at the end of the restricted speed zone. Else shows 0", "meters", "ORTS_REMAINING_TRAIN_LENGTH_PERCENT", "When the restricted speed zone flag is activated, displays the remaining train lenght percent that hasn't yet arrived at the end of the restricted speed zone. Else shows 0", "", "ORTS_ACCELERATION_IN_TIME", "Value of AccelerationBits; some cabs can show 'Arrows' pointing up or down according to speed change", "", diff --git a/Source/Orts.Formats.Msts/CabViewFile.cs b/Source/Orts.Formats.Msts/CabViewFile.cs index 501b1c23d7..1162452bb7 100644 --- a/Source/Orts.Formats.Msts/CabViewFile.cs +++ b/Source/Orts.Formats.Msts/CabViewFile.cs @@ -277,7 +277,7 @@ public enum CABViewControlTypes ORTS_NUMBER_OF_AXES_DISPLAY_TENS, ORTS_NUMBER_OF_AXES_DISPLAY_HUNDREDS, ORTS_TRAIN_LENGTH_METERS, - ORTS_REMAINING_TRAIN_LENGHT_SPEED_RESTRICTED, + ORTS_REMAINING_TRAIN_LENGTH_SPEED_RESTRICTED, ORTS_REMAINING_TRAIN_LENGTH_PERCENT, ORTS_MOTIVE_FORCE, ORTS_MOTIVE_FORCE_KILONEWTON, diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs index 26e5f89c8e..f5ce77dffc 100644 --- a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs +++ b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs @@ -1418,7 +1418,7 @@ public float GetDataOf(CabViewControl cvc) case CABViewControlTypes.ORTS_TRAIN_LENGTH_METERS: data = TrainLengthMeters; break; - case CABViewControlTypes.ORTS_REMAINING_TRAIN_LENGHT_SPEED_RESTRICTED: + case CABViewControlTypes.ORTS_REMAINING_TRAIN_LENGTH_SPEED_RESTRICTED: data = RestrictedRegionOdometer.Started ? RestrictedRegionOdometer.RemainingValue : 0; break; case CABViewControlTypes.ORTS_REMAINING_TRAIN_LENGTH_PERCENT: diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs index 187d941fca..b1ec3beb42 100644 --- a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +++ b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs @@ -2301,7 +2301,7 @@ public virtual int GetDrawIndex() case CABViewControlTypes.ORTS_NUMBER_OF_AXES_DISPLAY_TENS: case CABViewControlTypes.ORTS_NUMBER_OF_AXES_DISPLAY_HUNDREDS: case CABViewControlTypes.ORTS_TRAIN_LENGTH_METERS: - case CABViewControlTypes.ORTS_REMAINING_TRAIN_LENGHT_SPEED_RESTRICTED: + case CABViewControlTypes.ORTS_REMAINING_TRAIN_LENGTH_SPEED_RESTRICTED: case CABViewControlTypes.ORTS_REMAINING_TRAIN_LENGTH_PERCENT: case CABViewControlTypes.ORTS_MOTIVE_FORCE: case CABViewControlTypes.ORTS_MOTIVE_FORCE_KILONEWTON: