Automatic merge of T1.5.1-376-g885592329 and 9 pull requests

- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting - Pull request #732 at 2451991: Improvements for air brakes - Pull request #751 at 00981a2: Web interface to control cab controls with external hardware - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer - Pull request #803 at 7157e08: Various adjustments to steam adhesion - Pull request #813 at 001e285: Refactored garbage generators - Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration - Pull request #818 at 73b637f: Allow independent drive axles for locomotives
openrails · Apr 22, 2023 · 0f69523 · 0f69523
11 parents 36a5dd4 + 8855923 + de7a14f + 2451991 + 00981a2 + dc03850 + 4d198e4 + 7157e08 + 001e285 + a5cc165 + 73b637f
commit 0f69523
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -1740,8 +1740,8 @@ public List<MultiPositionController> CloneMPC(MSTSLocomotive locomotive)
 
         public override void InitializeMoving()
         {
-            AdhesionFilter.Reset(0.5f);
             base.InitializeMoving();
+            AdhesionFilter.Reset(0.5f);
             AverageForceN = MaxForceN * Train.MUThrottlePercent / 100;
             float maxPowerW = MaxPowerW * Train.MUThrottlePercent * Train.MUThrottlePercent / 10000;
             if (AverageForceN * SpeedMpS > maxPowerW) AverageForceN = maxPowerW / SpeedMpS;

diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
@@ -1012,10 +1012,9 @@ public override void Initialize()
 
         public override void InitializeMoving()
         {
+            base.InitializeMoving();
             PassengerCarPowerSupply?.InitializeMoving();
             LocomotiveAxles.InitializeMoving();
-
-            base.InitializeMoving();
         }
 
         /// <summary>

diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs
@@ -269,7 +269,6 @@ public void Restore(BinaryReader inf)
                     AxleList.Add(new Axle());
                     AxleList[i].Initialize();
                 }
-
             }
             foreach (var axle in AxleList)
                 axle.Restore(inf);
@@ -678,6 +677,7 @@ public void Restore(BinaryReader inf)
             previousSlipPercent = inf.ReadSingle();
             previousSlipSpeedMpS = inf.ReadSingle();
             AxleForceN = inf.ReadSingle();
+            AxleSpeedMpS = inf.ReadSingle();
         }
 
         /// <summary>
@@ -689,6 +689,7 @@ public void Save(BinaryWriter outf)
             outf.Write(previousSlipPercent);
             outf.Write(previousSlipSpeedMpS);
             outf.Write(AxleForceN);
+            outf.Write(AxleSpeedMpS);
         }
 
         /// <summary>