Skip to content

Commit cbe75e1

Browse files
committed
Automatic merge of T1.5.1-569-g8f17be306 and 14 pull requests
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #831 at 594df54: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #853 at d05f581: Notify out of focus - Pull request #855 at b39e5d8: Adds new route from TrainSimulations - Pull request #857 at 9afc8c3: Adding Air Flow Meters - Pull request #863 at a34b857: Alternate preset 3D cabviewpoints - Pull request #864 at e71bc5a: Fixes for Undesired Emergency Applications - Pull request #865 at 776d6df: Dispatcher window improvements - Pull request #866 at c15333e: Fix Articulation For 0-Axle Train Cars - Pull request #870 at 5cb32fa: Fix water restore - Pull request #871 at c2388e6: Signal aspects are multiplied when reopening Dispatcher Window - Pull request #872 at 00c5b8b: Fix Retainer State Disappearing from HUD on Restore
16 parents a339044 + 8f17be3 + 98dd1a7 + 594df54 + d00beb9 + 410a585 + d05f581 + b39e5d8 + 9afc8c3 + a34b857 + e71bc5a + 776d6df + c15333e + 5cb32fa + c2388e6 + 00c5b8b commit cbe75e1

File tree

1 file changed

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

1 file changed

+2
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ public override void Save(BinaryWriter outf)
331331
outf.Write(HandbrakePercent);
332332
outf.Write(ReleaseRatePSIpS);
333333
outf.Write(RetainerPressureThresholdPSI);
334+
outf.Write(RetainerDebugState);
334335
outf.Write(AutoCylPressurePSI);
335336
outf.Write(CylPressurePSI);
336337
outf.Write(AuxResPressurePSI);
@@ -358,6 +359,7 @@ public override void Restore(BinaryReader inf)
358359
HandbrakePercent = inf.ReadSingle();
359360
ReleaseRatePSIpS = inf.ReadSingle();
360361
RetainerPressureThresholdPSI = inf.ReadSingle();
362+
RetainerDebugState = inf.ReadString();
361363
AutoCylPressurePSI = inf.ReadSingle();
362364
CylPressurePSI = inf.ReadSingle();
363365
AuxResPressurePSI = inf.ReadSingle();

0 commit comments

Comments
 (0)