Skip to content

Commit 547296c

Browse files
committed
Automatic merge of T1.5.1-963-g375f79869 and 16 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 3ca0eb1: Blueprint/train car operations UI window - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #900 at c27f32d: DMI updates - Pull request #903 at 7af1f91: Downloading route content (Github, zip) - Pull request #912 at 5f5f1f5: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #922 at abe2e52: Autopilot for timetable mode - Pull request #923 at 4c27204: Add curve squeal to route - Pull request #939 at 15ba46b: Add KM/HOUR/MIN to Cabview Units + Custom Units - Pull request #940 at f8b5b15: Browser HUD column alignment improvements - Pull request #943 at 7eebedc: Cab View Dynamic Brakes Indication Fix
18 parents 71ab3cd + 375f798 + dfc715e + d00beb9 + f92de76 + 3ca0eb1 + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 7af1f91 + 5f5f1f5 + 26cc6a8 + abe2e52 + 4c27204 + 15ba46b + f8b5b15 + 7eebedc commit 547296c

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2235,10 +2235,8 @@ public virtual int GetDrawIndex()
22352235
{
22362236
if (Locomotive.CruiseControl != null)
22372237
{
2238-
if ((Locomotive.CruiseControl.SpeedRegMode == Simulation.RollingStocks.SubSystems.CruiseControl.SpeedRegulatorMode.Auto && !Locomotive.CruiseControl.DynamicBrakePriority) || Locomotive.DynamicBrakeIntervention > 0)
2239-
{
2238+
if (Locomotive.CruiseControl.SpeedRegMode == Simulation.RollingStocks.SubSystems.CruiseControl.SpeedRegulatorMode.Auto && !Locomotive.CruiseControl.DynamicBrakePriority)
22402239
index = 0;
2241-
}
22422240
else
22432241
index = PercentToIndex(dynBrakePercent);
22442242
}

0 commit comments

Comments
 (0)