Merge pull request #446 from Sharpe49/power-supply-fix-copy

cjakeman · web-flow · commit 8b9100d0dee8 · 2021-08-15T17:14:36.000+01:00
Fix for Copy function not being called in ScriptedDieselPowerSupply and ScriptedElectricPowerSupply https://bugs.launchpad.net/or/+bug/1938744
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs
@@ -23,7 +23,7 @@
 namespace Orts.Simulation.RollingStocks.SubSystems.PowerSupplies
 {
 
-    public class ScriptedDieselPowerSupply : ScriptedLocomotivePowerSupply, ISubSystem<ScriptedDieselPowerSupply>
+    public class ScriptedDieselPowerSupply : ScriptedLocomotivePowerSupply
     {
         public MSTSDieselLocomotive DieselLocomotive => Locomotive as MSTSDieselLocomotive;
         public ScriptedTractionCutOffRelay TractionCutOffRelay { get; protected set; }
@@ -61,10 +61,14 @@ public override void Parse(string lowercasetoken, STFReader stf)
             }
         }
 
-        public void Copy(ScriptedDieselPowerSupply other)
+        public override void Copy(IPowerSupply other)
         {
             base.Copy(other);
-            TractionCutOffRelay.Copy(other.TractionCutOffRelay);
+
+            if (other is ScriptedDieselPowerSupply scriptedOther)
+            {
+                TractionCutOffRelay.Copy(scriptedOther.TractionCutOffRelay);
+            }
         }
 
         public override void Initialize()
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DualModePowerSupply.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DualModePowerSupply.cs
@@ -23,7 +23,7 @@
 namespace Orts.Simulation.RollingStocks.SubSystems.PowerSupplies
 {
 
-    public class ScriptedDualModePowerSupply : ScriptedLocomotivePowerSupply, ISubSystem<ScriptedDualModePowerSupply>
+    public class ScriptedDualModePowerSupply : ScriptedLocomotivePowerSupply
     {
         public MSTSElectricLocomotive DualModeLocomotive => Locomotive as MSTSElectricLocomotive;
         public Pantographs Pantographs => Locomotive.Pantographs;
@@ -61,11 +61,15 @@ public override void Parse(string lowercasetoken, STFReader stf)
             }
         }
 
-        public void Copy(ScriptedDualModePowerSupply other)
+        public override void Copy(IPowerSupply other)
         {
-            base.Copy(other);            
-            CircuitBreaker.Copy(other.CircuitBreaker);
-            TractionCutOffRelay.Copy(other.TractionCutOffRelay);
+            base.Copy(other);
+
+            if (other is ScriptedDualModePowerSupply scriptedOther)
+            {
+                CircuitBreaker.Copy(scriptedOther.CircuitBreaker);
+                TractionCutOffRelay.Copy(scriptedOther.TractionCutOffRelay);
+            }
         }
 
         public override void Initialize()
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs
@@ -24,7 +24,7 @@
 namespace Orts.Simulation.RollingStocks.SubSystems.PowerSupplies
 {
 
-    public class ScriptedElectricPowerSupply : ScriptedLocomotivePowerSupply, ISubSystem<ScriptedElectricPowerSupply>
+    public class ScriptedElectricPowerSupply : ScriptedLocomotivePowerSupply
     {
         public MSTSElectricLocomotive ElectricLocomotive => Locomotive as MSTSElectricLocomotive;
         public Pantographs Pantographs => Locomotive.Pantographs;
@@ -60,10 +60,14 @@ public override void Parse(string lowercasetoken, STFReader stf)
             }
         }
 
-        public void Copy(ScriptedElectricPowerSupply other)
+        public override void Copy(IPowerSupply other)
         {
-            base.Copy(other);            
-            CircuitBreaker.Copy(other.CircuitBreaker);
+            base.Copy(other);
+
+            if (other is ScriptedElectricPowerSupply scriptedOther)
+            {
+                CircuitBreaker.Copy(scriptedOther.CircuitBreaker);
+            }
         }
 
         public override void Initialize()
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs
@@ -25,7 +25,7 @@
 namespace Orts.Simulation.RollingStocks.SubSystems.PowerSupplies
 {
 
-    public abstract class ScriptedLocomotivePowerSupply : ILocomotivePowerSupply, ISubSystem<ScriptedLocomotivePowerSupply>
+    public abstract class ScriptedLocomotivePowerSupply : ILocomotivePowerSupply
     {
         public readonly MSTSLocomotive Locomotive;
         protected Simulator Simulator => Locomotive.Simulator;
@@ -125,24 +125,19 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
             }
         }
 
-        public void Copy(IPowerSupply other)
+        public virtual void Copy(IPowerSupply other)
         {
             if (other is ScriptedLocomotivePowerSupply scriptedOther)
             {
-                Copy(scriptedOther);
-            }
-        }
+                BatterySwitch.Copy(scriptedOther.BatterySwitch);
+                MasterKey.Copy(scriptedOther.MasterKey);
+                ElectricTrainSupplySwitch.Copy(scriptedOther.ElectricTrainSupplySwitch);
 
-        public void Copy(ScriptedLocomotivePowerSupply other)
-        {
-            BatterySwitch.Copy(other.BatterySwitch);
-            MasterKey.Copy(other.MasterKey);
-            ElectricTrainSupplySwitch.Copy(other.ElectricTrainSupplySwitch);
+                ScriptName = scriptedOther.ScriptName;
 
-            ScriptName = other.ScriptName;
-
-            PowerOnDelayS = other.PowerOnDelayS;
-            AuxPowerOnDelayS = other.AuxPowerOnDelayS;
+                PowerOnDelayS = scriptedOther.PowerOnDelayS;
+                AuxPowerOnDelayS = scriptedOther.AuxPowerOnDelayS;
+            }
         }
 
         public virtual void Initialize()
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs
@@ -9,7 +9,7 @@ namespace Orts.Simulation.RollingStocks.SubSystems.PowerSupplies
     /// Basic power supply class for steam locomotives
     /// For electrical systems powered by battery
     /// </summary>
-    public class SteamPowerSupply : ILocomotivePowerSupply, ISubSystem<SteamPowerSupply>
+    public class SteamPowerSupply : ILocomotivePowerSupply
     {
         public readonly MSTSSteamLocomotive Locomotive;
         public PowerSupplyType Type => PowerSupplyType.Steam;
@@ -70,16 +70,11 @@ public void Copy(IPowerSupply other)
         {
             if (other is SteamPowerSupply steamOther)
             {
-                Copy(steamOther);
+                BatterySwitch.Copy(steamOther.BatterySwitch);
+                MasterKey.Copy(steamOther.MasterKey);
             }
         }
 
-        public void Copy(SteamPowerSupply other)
-        {
-            BatterySwitch.Copy(other.BatterySwitch);
-            MasterKey.Copy(other.MasterKey);
-        }
-
         public void Initialize()
         {
             BatterySwitch.Initialize();

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`namespace Orts.Simulation.RollingStocks.SubSystems.PowerSupplies`
`24`	`24`	`{`
`25`	`25`
`26`		`- public class ScriptedDieselPowerSupply : ScriptedLocomotivePowerSupply, ISubSystem<ScriptedDieselPowerSupply>`
	`26`	`+ public class ScriptedDieselPowerSupply : ScriptedLocomotivePowerSupply`
`27`	`27`	`{`
`28`	`28`	`public MSTSDieselLocomotive DieselLocomotive => Locomotive as MSTSDieselLocomotive;`
`29`	`29`	`public ScriptedTractionCutOffRelay TractionCutOffRelay { get; protected set; }`
`@@ -61,10 +61,14 @@ public override void Parse(string lowercasetoken, STFReader stf)`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`- public void Copy(ScriptedDieselPowerSupply other)`
	`64`	`+ public override void Copy(IPowerSupply other)`
`65`	`65`	`{`
`66`	`66`	`base.Copy(other);`
`67`		`- TractionCutOffRelay.Copy(other.TractionCutOffRelay);`
	`67`	`+`
	`68`	`+ if (other is ScriptedDieselPowerSupply scriptedOther)`
	`69`	`+ {`
	`70`	`+ TractionCutOffRelay.Copy(scriptedOther.TractionCutOffRelay);`
	`71`	`+ }`
`68`	`72`	`}`
`69`	`73`
`70`	`74`	`public override void Initialize()`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`namespace Orts.Simulation.RollingStocks.SubSystems.PowerSupplies`
`25`	`25`	`{`
`26`	`26`
`27`		`- public class ScriptedElectricPowerSupply : ScriptedLocomotivePowerSupply, ISubSystem<ScriptedElectricPowerSupply>`
	`27`	`+ public class ScriptedElectricPowerSupply : ScriptedLocomotivePowerSupply`
`28`	`28`	`{`
`29`	`29`	`public MSTSElectricLocomotive ElectricLocomotive => Locomotive as MSTSElectricLocomotive;`
`30`	`30`	`public Pantographs Pantographs => Locomotive.Pantographs;`
`@@ -60,10 +60,14 @@ public override void Parse(string lowercasetoken, STFReader stf)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- public void Copy(ScriptedElectricPowerSupply other)`
	`63`	`+ public override void Copy(IPowerSupply other)`
`64`	`64`	`{`
`65`		`- base.Copy(other);`
`66`		`- CircuitBreaker.Copy(other.CircuitBreaker);`
	`65`	`+ base.Copy(other);`
	`66`	`+`
	`67`	`+ if (other is ScriptedElectricPowerSupply scriptedOther)`
	`68`	`+ {`
	`69`	`+ CircuitBreaker.Copy(scriptedOther.CircuitBreaker);`
	`70`	`+ }`
`67`	`71`	`}`
`68`	`72`
`69`	`73`	`public override void Initialize()`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`namespace Orts.Simulation.RollingStocks.SubSystems.PowerSupplies`
`26`	`26`	`{`
`27`	`27`
`28`		`- public abstract class ScriptedLocomotivePowerSupply : ILocomotivePowerSupply, ISubSystem<ScriptedLocomotivePowerSupply>`
	`28`	`+ public abstract class ScriptedLocomotivePowerSupply : ILocomotivePowerSupply`
`29`	`29`	`{`
`30`	`30`	`public readonly MSTSLocomotive Locomotive;`
`31`	`31`	`protected Simulator Simulator => Locomotive.Simulator;`
`@@ -125,24 +125,19 @@ public virtual void Parse(string lowercasetoken, STFReader stf)`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`- public void Copy(IPowerSupply other)`
	`128`	`+ public virtual void Copy(IPowerSupply other)`
`129`	`129`	`{`
`130`	`130`	`if (other is ScriptedLocomotivePowerSupply scriptedOther)`
`131`	`131`	`{`
`132`		`- Copy(scriptedOther);`
`133`		`- }`
`134`		`- }`
	`132`	`+ BatterySwitch.Copy(scriptedOther.BatterySwitch);`
	`133`	`+ MasterKey.Copy(scriptedOther.MasterKey);`
	`134`	`+ ElectricTrainSupplySwitch.Copy(scriptedOther.ElectricTrainSupplySwitch);`
`135`	`135`
`136`		`- public void Copy(ScriptedLocomotivePowerSupply other)`
`137`		`- {`
`138`		`- BatterySwitch.Copy(other.BatterySwitch);`
`139`		`- MasterKey.Copy(other.MasterKey);`
`140`		`- ElectricTrainSupplySwitch.Copy(other.ElectricTrainSupplySwitch);`
	`136`	`+ ScriptName = scriptedOther.ScriptName;`
`141`	`137`
`142`		`- ScriptName = other.ScriptName;`
`143`		`-`
`144`		`- PowerOnDelayS = other.PowerOnDelayS;`
`145`		`- AuxPowerOnDelayS = other.AuxPowerOnDelayS;`
	`138`	`+ PowerOnDelayS = scriptedOther.PowerOnDelayS;`
	`139`	`+ AuxPowerOnDelayS = scriptedOther.AuxPowerOnDelayS;`
	`140`	`+ }`
`146`	`141`	`}`
`147`	`142`
`148`	`143`	`public virtual void Initialize()`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Orts.Simulation.RollingStocks.SubSystems.PowerSupplies`
`9`	`9`	`/// Basic power supply class for steam locomotives`
`10`	`10`	`/// For electrical systems powered by battery`
`11`	`11`	`/// </summary>`
`12`		`- public class SteamPowerSupply : ILocomotivePowerSupply, ISubSystem<SteamPowerSupply>`
	`12`	`+ public class SteamPowerSupply : ILocomotivePowerSupply`
`13`	`13`	`{`
`14`	`14`	`public readonly MSTSSteamLocomotive Locomotive;`
`15`	`15`	`public PowerSupplyType Type => PowerSupplyType.Steam;`
`@@ -70,16 +70,11 @@ public void Copy(IPowerSupply other)`
`70`	`70`	`{`
`71`	`71`	`if (other is SteamPowerSupply steamOther)`
`72`	`72`	`{`
`73`		`- Copy(steamOther);`
	`73`	`+ BatterySwitch.Copy(steamOther.BatterySwitch);`
	`74`	`+ MasterKey.Copy(steamOther.MasterKey);`
`74`	`75`	`}`
`75`	`76`	`}`
`76`	`77`
`77`		`- public void Copy(SteamPowerSupply other)`
`78`		`- {`
`79`		`- BatterySwitch.Copy(other.BatterySwitch);`
`80`		`- MasterKey.Copy(other.MasterKey);`
`81`		`- }`
`82`		`-`
`83`	`78`	`public void Initialize()`
`84`	`79`	`{`
`85`	`80`	`BatterySwitch.Initialize();`