Skip to content

Commit 6fe56a5

Browse files
committed
Automatic merge of T1.5.1-866-gbae4730e2 and 16 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - 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 9c456aa: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - 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 #897 at 42f1dd9: feat: Improved system information collection - Pull request #903 at 0d6d045: Downloading route content (Github, zip) - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #908 at 4b4afe3: feat: supports switching adhesion precisions - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR - Pull request #912 at 659396e: New Triple Valve Features Vol. 2 - Pull request #914 at 5e3fe31: Adjustments to Duplex steam - Pull request #915 at 6d911d7: Correct calculation error with curve friction
18 parents e6ac914 + bae4730 + 3539862 + d00beb9 + f92de76 + 9c456aa + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 42f1dd9 + 0d6d045 + 9b0b04f + 4b4afe3 + 6834af0 + 659396e + 5e3fe31 + 6d911d7 commit 6fe56a5

File tree

1 file changed

+2
-2
lines changed
  • Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ public override void Update(float elapsedClockSeconds)
10651065
// BailOff
10661066
if (engineBrakeStatus == ControllerState.BailOff)
10671067
{
1068-
AutoCylPressurePSI -= Math.Max(MaxReleaseRatePSIpS, loco.EngineBrakeReleaseRatePSIpS) * elapsedClockSeconds;
1068+
AutoCylPressurePSI -= MaxReleaseRatePSIpS * elapsedClockSeconds;
10691069
if (AutoCylPressurePSI < 0) AutoCylPressurePSI = 0;
10701070
}
10711071
// Emergency application
@@ -1107,7 +1107,7 @@ public override void Update(float elapsedClockSeconds)
11071107
}
11081108
else
11091109
{
1110-
AutoCylPressurePSI -= Math.Max(MaxReleaseRatePSIpS, loco.EngineBrakeReleaseRatePSIpS) * elapsedClockSeconds;
1110+
AutoCylPressurePSI -= MaxReleaseRatePSIpS * elapsedClockSeconds;
11111111
if (AutoCylPressurePSI < 0)
11121112
AutoCylPressurePSI = 0;
11131113
}

0 commit comments

Comments
 (0)