Fix for disrupted train after restore

Author: Sharpe49

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -50,15 +50,13 @@
 // #define DEBUG_COUPLER_FORCES
 
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using Orts.Formats.Msts;
 using Orts.MultiPlayer;
 using Orts.Simulation.AIs;
 using Orts.Simulation.RollingStocks;
-using Orts.Simulation.RollingStocks.SubSystems;
 using Orts.Simulation.RollingStocks.SubSystems.Brakes;
 using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;
-using Orts.Parsers.Msts;
+using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;
 using Orts.Simulation.Signalling;
 using Orts.Simulation.Timetables;
 using ORTS.Common;
@@ -71,7 +69,6 @@
 using System.Linq;
 using System.Text;
 using Event = Orts.Common.Event;
-using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;
 
 namespace Orts.Simulation.Physics
 {
@@ -664,11 +661,9 @@ public Train(Simulator simulator, Train orgTrain)
 
         }
 
-        //================================================================================================//
         /// <summary>
         /// Restore
-        /// <\summary>
-
+        /// </summary>
         public Train(Simulator simulator, BinaryReader inf)
         {
             Init(simulator);
@@ -953,7 +948,11 @@ private void RestoreCars(Simulator simulator, BinaryReader inf)
             if (count > 0)
             {
                 for (int i = 0; i < count; ++i)
-                    Cars.Add(RollingStock.Restore(simulator, inf, this));
+                {
+                    TrainCar car = RollingStock.Load(simulator, this, inf.ReadString(), false);
+                    car.Restore(inf);
+                    car.Initialize();
+                }
             }
             SetDPUnitIDs(true);
         }
@@ -1014,12 +1013,9 @@ private void RestoreDeadlockInfo(BinaryReader inf)
             }
         }
 
-
-        //================================================================================================//
         /// <summary>
         /// save game state
-        /// <\summary>
-
+        /// </summary>
         public virtual void Save(BinaryWriter outf)
         {
             SaveCars(outf);
@@ -1209,8 +1205,11 @@ public virtual void Save(BinaryWriter outf)
         private void SaveCars(BinaryWriter outf)
         {
             outf.Write(Cars.Count);
-            foreach (TrainCar car in Cars)
-                RollingStock.Save(outf, car);
+            foreach (MSTSWagon wagon in Cars.OfType<MSTSWagon>())
+            {
+                outf.Write(wagon.WagFilePath);
+                wagon.Save(outf);
+            }
         }
 
         static void SaveTrafficSDefinition(BinaryWriter outf, Traffic_Service_Definition thisTSD)
@@ -4258,9 +4257,8 @@ public TrainCar FindLeadLocomotive()
 
         public void PropagateBrakePressure(float elapsedClockSeconds)
         {
-            if (LeadLocomotiveIndex >= 0)
+            if (LeadLocomotive is MSTSLocomotive lead)
             {
-                MSTSLocomotive lead = (MSTSLocomotive)Cars[LeadLocomotiveIndex];
                 if (lead.TrainBrakeController != null)
                     lead.TrainBrakeController.UpdatePressure(ref EqualReservoirPressurePSIorInHg, elapsedClockSeconds, ref BrakeLine4);
                 if (lead.EngineBrakeController != null)

Source/Orts.Simulation/Simulation/RollingStocks/RollingStock.cs

@@ -96,21 +96,6 @@ public static TrainCar Load(Simulator simulator, Train train, string wagFilePath
             return car;
         }
 
-        public static void Save(BinaryWriter outf, TrainCar car)
-        {
-            MSTSWagon wagon = (MSTSWagon)car;   // extend this when we introduce other types of rolling stock
-            outf.Write(wagon.WagFilePath);
-            wagon.Save(outf);
-        }
-
-        public static TrainCar Restore(Simulator simulator, BinaryReader inf, Train train)
-        {
-            TrainCar car = Load(simulator, train, inf.ReadString(), false);
-            car.Restore(inf);
-            car.Initialize();
-            return car;
-        }
-
         /// <summary>
         /// Utility class to avoid loading multiple copies of the same file.
         /// </summary>