Merge pull request #846 from cesarBLG/fix-resume-initialize

cesarBLG · web-flow · commit 2f57132ee14a · 2023-07-25T22:08:11.000+02:00
Initialize cars before restore
diff --git a/Source/Orts.Simulation/Simulation/Physics/Train.cs b/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);
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs
@@ -128,6 +128,7 @@ public override void Copy(MSTSWagon copy)
         /// </summary>
         public override void Save(BinaryWriter outf)
         {
+            base.Save(outf);
             ControllerFactory.Save(GearBoxController, outf);
             outf.Write(ControlGearIndication);
             outf.Write(ControlGearIndex);
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs b/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)
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
@@ -322,6 +322,7 @@ public override void Save(BinaryWriter outf)
             outf.Write(ReleaseRatePSIpS);
             outf.Write(RetainerPressureThresholdPSI);
             outf.Write(AutoCylPressurePSI);
+            outf.Write(CylPressurePSI);
             outf.Write(AuxResPressurePSI);
             outf.Write(EmergResPressurePSI);
             outf.Write(ControlResPressurePSI);
@@ -345,6 +346,7 @@ public override void Restore(BinaryReader inf)
             ReleaseRatePSIpS = inf.ReadSingle();
             RetainerPressureThresholdPSI = inf.ReadSingle();
             AutoCylPressurePSI = inf.ReadSingle();
+            CylPressurePSI = inf.ReadSingle();
             AuxResPressurePSI = inf.ReadSingle();
             EmergResPressurePSI = inf.ReadSingle();
             ControlResPressurePSI = inf.ReadSingle();
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs b/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();
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs b/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,16 +1012,14 @@ public void Initialize()
 
         public void InitializeMoving()
         {
-            if (!Simulator.Settings.NoDieselEngineStart && !Locomotive.gearSaved)
-            {
-                RealRPM = IdleRPM;
-                State = DieselEngineState.Running;
-            }
-            else if (Locomotive.gearSaved)
+            RealRPM = IdleRPM;
+            State = DieselEngineState.Running;
+            if (ThrottleRPMTab != null)
             {
-                State = (DieselEngineState)Locomotive.dieselEngineRestoreState;
+                DemandedRPM = ThrottleRPMTab[Locomotive.ThrottlePercent];
+                DemandedRPM = MathHelper.Clamp(DemandedRPM, IdleRPM, MaxRPM);  // Clamp throttle setting within bounds
+                RealRPM = DemandedRPM;
             }
-
             GearBox?.InitializeMoving();
         }
 
@@ -1594,20 +1586,12 @@ 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
-
-            if (Locomotive.gearSaved)
-            {
-                GearBox = new GearBox(this);
-                GearBox.Restore(inf);
-            }
+            GearBox?.Restore(inf);
         }
 
         public void Save(BinaryWriter outf)
@@ -1617,16 +1601,7 @@ public void Save(BinaryWriter outf)
             outf.Write(OutputPowerW);
             outf.Write(DieselTemperatureDeg);
             outf.Write(GovernorEnabled);
-
-            if (GearBox != null)
-            {
-                outf.Write(true);
-                GearBox.Save(outf);
-            }
-            else
-            {
-                outf.Write(false);
-            }
+            GearBox?.Save(outf);
         }
 
         /// <summary>
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs b/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);
         }
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DualModePowerSupply.cs b/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);
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs b/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);
         }
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Pantograph.cs b/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);
             }
         }
 
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/TractionCutOffRelay.cs b/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();
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/GearBox.cs b/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();
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
@@ -946,19 +946,14 @@ public string GetDisplayString(int commandIndex)
 
         public void Save(BinaryWriter outf)
         {
-            outf.Write(ScriptName ?? "");
-            if (ScriptName != "")
+            if (!string.IsNullOrEmpty(ScriptName))
                 Script.Save(outf);
         }
 
         public void Restore(BinaryReader inf)
         {
-            ScriptName = inf.ReadString();
-            if (ScriptName != "")
-            {
-                Initialize();
+            if (!string.IsNullOrEmpty(ScriptName))
                 Script.Restore(inf);
-            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -952,9 +952,8 @@ private void RestoreCars(Simulator simulator, BinaryReader inf)`
`952`	`952`	`{`
`953`	`953`	`for (int i = 0; i < count; ++i)`
`954`	`954`	`{`
`955`		`- TrainCar car = RollingStock.Load(simulator, this, inf.ReadString(), false);`
	`955`	`+ TrainCar car = RollingStock.Load(simulator, this, inf.ReadString());`
`956`	`956`	`car.Restore(inf);`
`957`		`- car.Initialize();`
`958`	`957`	`}`
`959`	`958`	`}`
`960`	`959`	`SetDPUnitIDs(true);`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ public override void Copy(MSTSWagon copy)`
`128`	`128`	`/// </summary>`
`129`	`129`	`public override void Save(BinaryWriter outf)`
`130`	`130`	`{`
	`131`	`+ base.Save(outf);`
`131`	`132`	`ControllerFactory.Save(GearBoxController, outf);`
`132`	`133`	`outf.Write(ControlGearIndication);`
`133`	`134`	`outf.Write(ControlGearIndex);`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,6 @@ public void HandleEvent(PowerSupplyEvent evt)`
`188`	`188`
`189`	`189`	`public void Save(BinaryWriter outf)`
`190`	`190`	`{`
`191`		`- outf.Write(ScriptName);`
`192`	`191`	`outf.Write(DelayS);`
`193`	`192`	`outf.Write(State.ToString());`
`194`	`193`	`outf.Write(DriverClosingOrder);`
`@@ -199,7 +198,6 @@ public void Save(BinaryWriter outf)`
`199`	`198`
`200`	`199`	`public void Restore(BinaryReader inf)`
`201`	`200`	`{`
`202`		`- ScriptName = inf.ReadString();`
`203`	`201`	`DelayS = inf.ReadSingle();`
`204`	`202`	`State = (CircuitBreakerState)Enum.Parse(typeof(CircuitBreakerState), inf.ReadString());`
`205`	`203`	`DriverClosingOrder = inf.ReadBoolean();`
Original file line number	Diff line number	Diff line change
`@@ -110,16 +110,12 @@ public override void InitializeMoving()`
`110`	`110`
`111`	`111`	`public override void Save(BinaryWriter outf)`
`112`	`112`	`{`
`113`		`- outf.Write(ScriptName);`
`114`		`-`
`115`	`113`	`base.Save(outf);`
`116`	`114`	`TractionCutOffRelay.Save(outf);`
`117`	`115`	`}`
`118`	`116`
`119`	`117`	`public override void Restore(BinaryReader inf)`
`120`	`118`	`{`
`121`		`- ScriptName = inf.ReadString();`
`122`		`-`
`123`	`119`	`base.Restore(inf);`
`124`	`120`	`TractionCutOffRelay.Restore(inf);`
`125`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,17 +112,13 @@ public override void InitializeMoving()`
`112`	`112`
`113`	`113`	`public override void Save(BinaryWriter outf)`
`114`	`114`	`{`
`115`		`- outf.Write(ScriptName);`
`116`		`-`
`117`	`115`	`base.Save(outf);`
`118`	`116`	`CircuitBreaker.Save(outf);`
`119`	`117`	`TractionCutOffRelay.Save(outf);`
`120`	`118`	`}`
`121`	`119`
`122`	`120`	`public override void Restore(BinaryReader inf)`
`123`	`121`	`{`
`124`		`- ScriptName = inf.ReadString();`
`125`		`-`
`126`	`122`	`base.Restore(inf);`
`127`	`123`	`CircuitBreaker.Restore(inf);`
`128`	`124`	`TractionCutOffRelay.Restore(inf);`
Original file line number	Diff line number	Diff line change
`@@ -108,16 +108,12 @@ public override void InitializeMoving()`
`108`	`108`
`109`	`109`	`public override void Save(BinaryWriter outf)`
`110`	`110`	`{`
`111`		`- outf.Write(ScriptName);`
`112`		`-`
`113`	`111`	`base.Save(outf);`
`114`	`112`	`CircuitBreaker.Save(outf);`
`115`	`113`	`}`
`116`	`114`
`117`	`115`	`public override void Restore(BinaryReader inf)`
`118`	`116`	`{`
`119`		`- ScriptName = inf.ReadString();`
`120`		`-`
`121`	`117`	`base.Restore(inf);`
`122`	`118`	`CircuitBreaker.Restore(inf);`
`123`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,14 @@ public void Copy(Pantographs pantographs)`
`79`	`79`
`80`	`80`	`public void Restore(BinaryReader inf)`
`81`	`81`	`{`
`82`		`- List.Clear();`
`83`		`-`
`84`	`82`	`int n = inf.ReadInt32();`
`85`	`83`	`for (int i = 0; i < n; i++)`
`86`	`84`	`{`
`87`		`- List.Add(new Pantograph(Wagon));`
`88`		`- List.Last().Restore(inf);`
	`85`	`+ if (i >= List.Count)`
	`86`	`+ {`
	`87`	`+ List.Add(new Pantograph(Wagon));`
	`88`	`+ }`
	`89`	`+ List[i].Restore(inf);`
`89`	`90`	`}`
`90`	`91`	`}`
`91`	`92`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,6 @@ public void HandleEvent(PowerSupplyEvent evt)`
`165`	`165`
`166`	`166`	`public void Save(BinaryWriter outf)`
`167`	`167`	`{`
`168`		`- outf.Write(ScriptName);`
`169`	`168`	`outf.Write(DelayS);`
`170`	`169`	`outf.Write(State.ToString());`
`171`	`170`	`outf.Write(DriverClosingOrder);`
`@@ -176,7 +175,6 @@ public void Save(BinaryWriter outf)`
`176`	`175`
`177`	`176`	`public void Restore(BinaryReader inf)`
`178`	`177`	`{`
`179`		`- ScriptName = inf.ReadString();`
`180`	`178`	`DelayS = inf.ReadSingle();`
`181`	`179`	`State = (TractionCutOffRelayState)Enum.Parse(typeof(TractionCutOffRelayState), inf.ReadString());`
`182`	`180`	`DriverClosingOrder = inf.ReadBoolean();`
Original file line number	Diff line number	Diff line change
`@@ -946,19 +946,14 @@ public string GetDisplayString(int commandIndex)`
`946`	`946`
`947`	`947`	`public void Save(BinaryWriter outf)`
`948`	`948`	`{`
`949`		`- outf.Write(ScriptName ?? "");`
`950`		`- if (ScriptName != "")`
	`949`	`+ if (!string.IsNullOrEmpty(ScriptName))`
`951`	`950`	`Script.Save(outf);`
`952`	`951`	`}`
`953`	`952`
`954`	`953`	`public void Restore(BinaryReader inf)`
`955`	`954`	`{`
`956`		`- ScriptName = inf.ReadString();`
`957`		`- if (ScriptName != "")`
`958`		`- {`
`959`		`- Initialize();`
	`955`	`+ if (!string.IsNullOrEmpty(ScriptName))`
`960`	`956`	`Script.Restore(inf);`
`961`		`- }`
`962`	`957`	`}`
`963`	`958`	`}`
`964`	`959`