Skip to content

Commit 59fb032

Browse files
committed
Automatic merge of T1.6-rc8-48-ga5be12922 and 14 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 9b80fac: Automatic speed control - Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1124 at e241a0d: Built-in PBL2 brake controller - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at ba9e40a: Status in Work Orders popup set too fast - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1155 at 40f8c34: fix for illegal characters in refeerence to Shape file - Pull request #1157 at 39cd994: Dynamic brake authorization by TCS - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
16 parents f40d537 + a5be129 + e10390b + 9b80fac + ccc5c4d + 270f22f + ba3c47f + 91d2d26 + e241a0d + 8ae6bb7 + ba9e40a + 66dfd09 + 40f8c34 + 39cd994 + 5845a1a + 1d7643d commit 59fb032

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ public void Save(BinaryWriter outf)
790790
outf.Write(currentSelectedSpeedMpS);
791791
outf.Write(RestrictedRegionOdometer.Started);
792792
outf.Write(RestrictedRegionOdometer.RemainingValue);
793-
MaxForceSelectorController.Save(outf);
793+
ControllerFactory.Save(MaxForceSelectorController, outf);
794794
outf.Write(SelectedNumberOfAxles);
795795
outf.Write(SelectedSpeedMpS);
796796
outf.Write(DynamicBrakePriority);
@@ -807,7 +807,7 @@ public void Restore(BinaryReader inf)
807807
bool started = inf.ReadBoolean();
808808
RestrictedRegionOdometer.Setup(inf.ReadSingle());
809809
if (started) RestrictedRegionOdometer.Start();
810-
MaxForceSelectorController.Restore(inf);
810+
ControllerFactory.Restore(MaxForceSelectorController, inf);
811811
SelectedNumberOfAxles = inf.ReadInt32();
812812
SelectedSpeedMpS = inf.ReadSingle();
813813
DynamicBrakePriority = inf.ReadBoolean();

0 commit comments

Comments
 (0)