Merge pull request #498 from Sharpe49/power-supply-fix-cabview-controls

twpol · web-flow · commit 39557aff9596 · 2021-09-28T19:24:47.000+01:00
Fixed wrong integer values for cabview controls related to power supplies
diff --git a/Source/Orts.Simulation/Common/Scripting/PowerSupply/CircuitBreaker.cs b/Source/Orts.Simulation/Common/Scripting/PowerSupply/CircuitBreaker.cs
@@ -46,7 +46,7 @@ public abstract class CircuitBreaker : TractionCutOffSubsystem
 
     public enum CircuitBreakerState
     {
-        [GetString("Unavailable")] Unavailable,
+        [GetString("Unavailable")] Unavailable = -1,
         [GetParticularString("CircuitBreaker", "Open")] Open,
         [GetParticularString("CircuitBreaker", "Closing")] Closing,
         [GetParticularString("CircuitBreaker", "Closed")] Closed
diff --git a/Source/Orts.Simulation/Common/Scripting/PowerSupply/PowerSupply.cs b/Source/Orts.Simulation/Common/Scripting/PowerSupply/PowerSupply.cs
@@ -160,15 +160,15 @@ public enum PowerSupplyType
 
     public enum PowerSupplyState
     {
-        [GetString("Unavailable")] Unavailable,
+        [GetString("Unavailable")] Unavailable = -1,
         [GetParticularString("PowerSupply", "Off")] PowerOff,
         [GetParticularString("PowerSupply", "On ongoing")] PowerOnOngoing,
         [GetParticularString("PowerSupply", "On")] PowerOn
     }
 
     public enum PantographState
     {
-        [GetString("Unavailable")] Unavailable,
+        [GetString("Unavailable")] Unavailable = -1,
         [GetParticularString("Pantograph", "Down")] Down,
         [GetParticularString("Pantograph", "Lowering")] Lowering,
         [GetParticularString("Pantograph", "Raising")] Raising,
@@ -177,7 +177,7 @@ public enum PantographState
 
     public enum DieselEngineState
     {
-        [GetString("Unavailable")] Unavailable,
+        [GetString("Unavailable")] Unavailable = -1,
         [GetParticularString("Engine", "Stopped")] Stopped,
         [GetParticularString("Engine", "Stopping")] Stopping,
         [GetParticularString("Engine", "Starting")] Starting,
diff --git a/Source/Orts.Simulation/Common/Scripting/PowerSupply/TractionCutOffRelay.cs b/Source/Orts.Simulation/Common/Scripting/PowerSupply/TractionCutOffRelay.cs
@@ -44,7 +44,7 @@ public abstract class TractionCutOffRelay : TractionCutOffSubsystem
 
     public enum TractionCutOffRelayState
     {
-        [GetString("Unavailable")] Unavailable,
+        [GetString("Unavailable")] Unavailable = -1,
         [GetParticularString("TractionCutOffRelay", "Open")] Open,
         [GetParticularString("TractionCutOffRelay", "Closing")] Closing,
         [GetParticularString("TractionCutOffRelay", "Closed")] Closed

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public abstract class CircuitBreaker : TractionCutOffSubsystem`
`46`	`46`
`47`	`47`	`public enum CircuitBreakerState`
`48`	`48`	`{`
`49`		`- [GetString("Unavailable")] Unavailable,`
	`49`	`+ [GetString("Unavailable")] Unavailable = -1,`
`50`	`50`	`[GetParticularString("CircuitBreaker", "Open")] Open,`
`51`	`51`	`[GetParticularString("CircuitBreaker", "Closing")] Closing,`
`52`	`52`	`[GetParticularString("CircuitBreaker", "Closed")] Closed`
Original file line number	Diff line number	Diff line change
`@@ -160,15 +160,15 @@ public enum PowerSupplyType`
`160`	`160`
`161`	`161`	`public enum PowerSupplyState`
`162`	`162`	`{`
`163`		`- [GetString("Unavailable")] Unavailable,`
	`163`	`+ [GetString("Unavailable")] Unavailable = -1,`
`164`	`164`	`[GetParticularString("PowerSupply", "Off")] PowerOff,`
`165`	`165`	`[GetParticularString("PowerSupply", "On ongoing")] PowerOnOngoing,`
`166`	`166`	`[GetParticularString("PowerSupply", "On")] PowerOn`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`public enum PantographState`
`170`	`170`	`{`
`171`		`- [GetString("Unavailable")] Unavailable,`
	`171`	`+ [GetString("Unavailable")] Unavailable = -1,`
`172`	`172`	`[GetParticularString("Pantograph", "Down")] Down,`
`173`	`173`	`[GetParticularString("Pantograph", "Lowering")] Lowering,`
`174`	`174`	`[GetParticularString("Pantograph", "Raising")] Raising,`
`@@ -177,7 +177,7 @@ public enum PantographState`
`177`	`177`
`178`	`178`	`public enum DieselEngineState`
`179`	`179`	`{`
`180`		`- [GetString("Unavailable")] Unavailable,`
	`180`	`+ [GetString("Unavailable")] Unavailable = -1,`
`181`	`181`	`[GetParticularString("Engine", "Stopped")] Stopped,`
`182`	`182`	`[GetParticularString("Engine", "Stopping")] Stopping,`
`183`	`183`	`[GetParticularString("Engine", "Starting")] Starting,`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public abstract class TractionCutOffRelay : TractionCutOffSubsystem`
`44`	`44`
`45`	`45`	`public enum TractionCutOffRelayState`
`46`	`46`	`{`
`47`		`- [GetString("Unavailable")] Unavailable,`
	`47`	`+ [GetString("Unavailable")] Unavailable = -1,`
`48`	`48`	`[GetParticularString("TractionCutOffRelay", "Open")] Open,`
`49`	`49`	`[GetParticularString("TractionCutOffRelay", "Closing")] Closing,`
`50`	`50`	`[GetParticularString("TractionCutOffRelay", "Closed")] Closed`