Skip to content

Commit 5d5faa2

Browse files
committed
Automatic merge of T1.5.1-1606-gf9e80b97d and 11 pull requests
- Pull request #900 at b54024b: DMI in 3D cab + two more dials - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #961 at ffccb2e: Improvements for Power Supplies - Pull request #1015 at 1ade99e: Enhancements for EP brakes - Pull request #1026 at 6a89a97: Fix for Multiplayer: remote trains chuff can't be heard https://bugs.launchpad.net/or/+bug/2092771 - Pull request #1029 at 31fd7d2: Superelevation Follow Up Fixes - Pull request #1031 at 34aa23a: Multiplayer Server, forked from Open Rails Ultimate; blueprint https://blueprints.launchpad.net/or/+spec/multiplayer-server - Pull request #1047 at eb8027b: Docs: adds translation docs - Pull request #1058 at 626ebed: Refactor notification parameters - Pull request #1055 at d1a56b3: Route Based TTrack Sounds - Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
13 parents 3e68613 + f9e80b9 + b54024b + 1f5ba4c + ffccb2e + 1ade99e + 6a89a97 + 31fd7d2 + 34aa23a + eb8027b + 626ebed + d1a56b3 + f1681df commit 5d5faa2

File tree

1 file changed

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

1 file changed

+9
-2
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,15 @@ public override void Update(float elapsedClockSeconds)
134134
}
135135
if (EPBrakeActiveInhibitsTripleValve)
136136
{
137-
HoldingValve = ValveState.Release;
138-
IsolationValve = ValveState.Lap;
137+
if (TripleValveState != ValveState.Emergency)
138+
{
139+
HoldingValve = ValveState.Release;
140+
IsolationValve = ValveState.Lap;
141+
}
142+
else
143+
{
144+
IsolationValve = ValveState.Release;
145+
}
139146
}
140147

141148
base.Update(elapsedClockSeconds); // Allow processing of other valid tokens

0 commit comments

Comments
 (0)