Skip to content

Commit 73b637f

Browse files
committed
Trying to fix initialization issues
1 parent 5c0bb4f commit 73b637f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1734,8 +1734,8 @@ public List<MultiPositionController> CloneMPC(MSTSLocomotive locomotive)
17341734

17351735
public override void InitializeMoving()
17361736
{
1737-
AdhesionFilter.Reset(0.5f);
17381737
base.InitializeMoving();
1738+
AdhesionFilter.Reset(0.5f);
17391739
AverageForceN = MaxForceN * Train.MUThrottlePercent / 100;
17401740
float maxPowerW = MaxPowerW * Train.MUThrottlePercent * Train.MUThrottlePercent / 10000;
17411741
if (AverageForceN * SpeedMpS > maxPowerW) AverageForceN = maxPowerW / SpeedMpS;

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,10 +1014,9 @@ public override void Initialize()
10141014

10151015
public override void InitializeMoving()
10161016
{
1017+
base.InitializeMoving();
10171018
PassengerCarPowerSupply?.InitializeMoving();
10181019
LocomotiveAxles.InitializeMoving();
1019-
1020-
base.InitializeMoving();
10211020
}
10221021

10231022
/// <summary>

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ public void Restore(BinaryReader inf)
269269
AxleList.Add(new Axle());
270270
AxleList[i].Initialize();
271271
}
272-
273272
}
274273
foreach (var axle in AxleList)
275274
axle.Restore(inf);
@@ -678,6 +677,7 @@ public void Restore(BinaryReader inf)
678677
previousSlipPercent = inf.ReadSingle();
679678
previousSlipSpeedMpS = inf.ReadSingle();
680679
AxleForceN = inf.ReadSingle();
680+
AxleSpeedMpS = inf.ReadSingle();
681681
}
682682

683683
/// <summary>
@@ -689,6 +689,7 @@ public void Save(BinaryWriter outf)
689689
outf.Write(previousSlipPercent);
690690
outf.Write(previousSlipSpeedMpS);
691691
outf.Write(AxleForceN);
692+
outf.Write(AxleSpeedMpS);
692693
}
693694

694695
/// <summary>

0 commit comments

Comments
 (0)