Skip to content

Commit 6bf3733

Browse files
committed
Trying to fix initialization issues
1 parent cebe7ac commit 6bf3733

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
@@ -1740,8 +1740,8 @@ public List<MultiPositionController> CloneMPC(MSTSLocomotive locomotive)
17401740

17411741
public override void InitializeMoving()
17421742
{
1743-
AdhesionFilter.Reset(0.5f);
17441743
base.InitializeMoving();
1744+
AdhesionFilter.Reset(0.5f);
17451745
AverageForceN = MaxForceN * Train.MUThrottlePercent / 100;
17461746
float maxPowerW = MaxPowerW * Train.MUThrottlePercent * Train.MUThrottlePercent / 10000;
17471747
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
@@ -1015,10 +1015,9 @@ public override void Initialize()
10151015

10161016
public override void InitializeMoving()
10171017
{
1018+
base.InitializeMoving();
10181019
PassengerCarPowerSupply?.InitializeMoving();
10191020
LocomotiveAxles.InitializeMoving();
1020-
1021-
base.InitializeMoving();
10221021
}
10231022

10241023
/// <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)