Initialize cars before restore

Author: cesarBLG

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

@@ -952,9 +952,8 @@ private void RestoreCars(Simulator simulator, BinaryReader inf)
             {
                 for (int i = 0; i < count; ++i)
                 {
-                    TrainCar car = RollingStock.Load(simulator, this, inf.ReadString(), false);
+                    TrainCar car = RollingStock.Load(simulator, this, inf.ReadString());
                     car.Restore(inf);
-                    car.Initialize();
                 }
             }
             SetDPUnitIDs(true);

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

@@ -91,11 +91,6 @@ public float DieselLevelL
 
         public float LocomotiveMaxRailOutputPowerW;
 
-        public int currentGearIndexRestore = -1;
-        public int currentnextGearRestore = -1;
-        public bool gearSaved;
-        public int dieselEngineRestoreState;
-
         public float EngineRPM;
         public SmoothedData ExhaustParticles = new SmoothedData(1);
         public SmoothedData ExhaustMagnitude = new SmoothedData(1);
@@ -476,17 +471,6 @@ public override void Initialize()
                 }
             }
 
-            // TO BE LOOKED AT - fix restoration process for gearbox and gear controller
-            // It appears that the gearbox is initialised in two different places to cater for Basic and Advanced ENG file configurations(?).
-            // Hence the restore values recovered in gearbox class are being overwritten , and resume was not working correctly
-            // Hence restore gear position values are read as part of the diesel and restored at this point.
-            if (gearSaved)
-            {
-                DieselEngines[0].GearBox.nextGearIndex = currentnextGearRestore;
-                DieselEngines[0].GearBox.currentGearIndex = currentGearIndexRestore;
-                GearBoxController.SetValue((float)DieselEngines[0].GearBox.currentGearIndex);
-            }
-
             if (Simulator.Settings.VerboseConfigurationMessages)
             {
                 if (DieselEngines.HasGearBox)

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs

@@ -188,7 +188,6 @@ public void HandleEvent(PowerSupplyEvent evt)
 
         public void Save(BinaryWriter outf)
         {
-            outf.Write(ScriptName);
             outf.Write(DelayS);
             outf.Write(State.ToString());
             outf.Write(DriverClosingOrder);
@@ -199,7 +198,6 @@ public void Save(BinaryWriter outf)
 
         public void Restore(BinaryReader inf)
         {
-            ScriptName = inf.ReadString();
             DelayS = inf.ReadSingle();
             State = (CircuitBreakerState)Enum.Parse(typeof(CircuitBreakerState), inf.ReadString());
             DriverClosingOrder = inf.ReadBoolean();

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs

@@ -109,7 +109,6 @@ public void Parse(string lowercasetoken, STFReader stf)
                             DEList.Add(new DieselEngine(Locomotive));
 
                             DEList[i].Parse(stf);
-                            DEList[i].Initialize();
 
                             // sets flag to indicate that a diesel eng prime mover code block has been defined by user, otherwise OR will define one through the next code section using "MSTS" values
                             DEList[i].DieselEngineConfigured = true;
@@ -119,7 +118,6 @@ public void Parse(string lowercasetoken, STFReader stf)
                         {
                             STFException.TraceWarning(stf, "Diesel engine model has some errors - loading MSTS format");
                             DEList[i].InitFromMSTS();
-                            DEList[i].Initialize();
                         }
                     }
                     break;
@@ -993,15 +991,11 @@ public void Copy(DieselEngine other)
 
         public void Initialize()
         {
-            if (!Simulator.Settings.NoDieselEngineStart && !Locomotive.gearSaved)
+            if (!Simulator.Settings.NoDieselEngineStart)
             {
                 RealRPM = IdleRPM;
                 State = DieselEngineState.Running;
             }
-            else if (Locomotive.gearSaved)
-            {
-                State = (DieselEngineState)Locomotive.dieselEngineRestoreState;
-            }
 
             RPMRange = MaxRPM - IdleRPM;
             MagnitudeRange = MaxMagnitude - InitialMagnitude;
@@ -1018,15 +1012,8 @@ public void Initialize()
 
         public void InitializeMoving()
         {
-            if (!Simulator.Settings.NoDieselEngineStart && !Locomotive.gearSaved)
-            {
-                RealRPM = IdleRPM;
-                State = DieselEngineState.Running;
-            }
-            else if (Locomotive.gearSaved)
-            {
-                State = (DieselEngineState)Locomotive.dieselEngineRestoreState;
-            }
+            RealRPM = IdleRPM;
+            State = DieselEngineState.Running;
 
             GearBox?.InitializeMoving();
         }
@@ -1594,16 +1581,15 @@ public void HandleEvent(PowerSupplyEvent evt)
 
         public void Restore(BinaryReader inf)
         {
-            Locomotive.dieselEngineRestoreState = inf.ReadInt32();
-            State = (DieselEngineState)Locomotive.dieselEngineRestoreState;
+            State = (DieselEngineState)inf.ReadInt32();
             RealRPM = inf.ReadSingle();
             OutputPowerW = inf.ReadSingle();
             DieselTemperatureDeg = inf.ReadSingle();
             GovernorEnabled = inf.ReadBoolean();
 
-            Locomotive.gearSaved = inf.ReadBoolean();  // read boolean which indicates gear data was saved
+            bool gearSaved = inf.ReadBoolean();  // read boolean which indicates gear data was saved
 
-            if (Locomotive.gearSaved)
+            if (gearSaved)
             {
                 GearBox = new GearBox(this);
                 GearBox.Restore(inf);

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs

@@ -110,16 +110,12 @@ public override void InitializeMoving()
 
         public override void Save(BinaryWriter outf)
         {
-            outf.Write(ScriptName);
-
             base.Save(outf);
             TractionCutOffRelay.Save(outf);
         }
 
         public override void Restore(BinaryReader inf)
         {
-            ScriptName = inf.ReadString();
-
             base.Restore(inf);
             TractionCutOffRelay.Restore(inf);
         }

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DualModePowerSupply.cs

@@ -112,17 +112,13 @@ public override void InitializeMoving()
 
         public override void Save(BinaryWriter outf)
         {
-            outf.Write(ScriptName);
-
             base.Save(outf);
             CircuitBreaker.Save(outf);
             TractionCutOffRelay.Save(outf);
         }
 
         public override void Restore(BinaryReader inf)
         {
-            ScriptName = inf.ReadString();
-
             base.Restore(inf);
             CircuitBreaker.Restore(inf);
             TractionCutOffRelay.Restore(inf);

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs

@@ -108,16 +108,12 @@ public override void InitializeMoving()
 
         public override void Save(BinaryWriter outf)
         {
-            outf.Write(ScriptName);
-
             base.Save(outf);
             CircuitBreaker.Save(outf);
         }
 
         public override void Restore(BinaryReader inf)
         {
-            ScriptName = inf.ReadString();
-
             base.Restore(inf);
             CircuitBreaker.Restore(inf);
         }

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Pantograph.cs

@@ -79,13 +79,14 @@ public void Copy(Pantographs pantographs)
 
         public void Restore(BinaryReader inf)
         {
-            List.Clear();
-
             int n = inf.ReadInt32();
             for (int i = 0; i < n; i++)
             {
-                List.Add(new Pantograph(Wagon));
-                List.Last().Restore(inf);
+                if (i >= List.Count)
+                {
+                    List.Add(new Pantograph(Wagon));
+                }
+                List[i].Restore(inf);
             }
         }
 

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/TractionCutOffRelay.cs

@@ -165,7 +165,6 @@ public void HandleEvent(PowerSupplyEvent evt)
 
         public void Save(BinaryWriter outf)
         {
-            outf.Write(ScriptName);
             outf.Write(DelayS);
             outf.Write(State.ToString());
             outf.Write(DriverClosingOrder);
@@ -176,7 +175,6 @@ public void Save(BinaryWriter outf)
 
         public void Restore(BinaryReader inf)
         {
-            ScriptName = inf.ReadString();
             DelayS = inf.ReadSingle();
             State = (TractionCutOffRelayState)Enum.Parse(typeof(TractionCutOffRelayState), inf.ReadString());
             DriverClosingOrder = inf.ReadBoolean();

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

@@ -751,9 +751,7 @@ public void Copy(GearBox copy)
         public void Restore(BinaryReader inf)
         {
             currentGearIndex = inf.ReadInt32();
-            Locomotive.currentGearIndexRestore = currentGearIndex;
             nextGearIndex = inf.ReadInt32();
-            Locomotive.currentnextGearRestore = nextGearIndex;
             gearedUp = inf.ReadBoolean();
             gearedDown = inf.ReadBoolean();
             clutchOn = inf.ReadBoolean();