Cleanup of AcceptMUSignals variable

Csantucci · Csantucci · commit a215a71c8005 · 2021-11-30T22:55:33.000+01:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -1837,7 +1837,7 @@ public override void Update(float elapsedClockSeconds)
             {
                 case Train.TRAINTYPE.AI:
                 case Train.TRAINTYPE.AI_PLAYERHOSTING:
-                    if (AcceptMUSignals)
+                    if (RemoteControlGroup != -1)
                     {
                         if (!LocomotivePowerSupply.MainPowerSupplyOn)
                         {
@@ -5038,7 +5038,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                         foreach (var car in Train.Cars)
                         {
                             var dieselLoco = car as MSTSDieselLocomotive;
-                            if (dieselLoco != null && dieselLoco.AcceptMUSignals)
+                            if (dieselLoco != null && dieselLoco.RemoteControlGroup != -1)
                             {
                                 if (car == Simulator.PlayerLocomotive && dieselLoco.DieselEngines.Count > 1)
                                 {
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs
@@ -278,7 +278,7 @@ protected virtual void AssignScriptFunctions()
             {
                 DieselEngineState state = DieselEngineState.Unavailable;
 
-                foreach (MSTSDieselLocomotive locomotive in Train.Cars.OfType<MSTSDieselLocomotive>().Where((MSTSLocomotive locomotive) => { return locomotive.AcceptMUSignals; }))
+                foreach (MSTSDieselLocomotive locomotive in Train.Cars.OfType<MSTSDieselLocomotive>().Where((MSTSLocomotive locomotive) => { return locomotive.RemoteControlGroup != -1; }))
                 {
                     if (locomotive == Simulator.PlayerLocomotive)
                     {
@@ -330,7 +330,7 @@ protected virtual void AssignScriptFunctions()
                 {
                     foreach (MSTSLocomotive locomotive in Locomotive.Train.Cars.OfType<MSTSLocomotive>())
                     {
-                        if (locomotive != Locomotive && locomotive != Locomotive.Train.LeadLocomotive && locomotive.AcceptMUSignals)
+                        if (locomotive != Locomotive && locomotive != Locomotive.Train.LeadLocomotive && locomotive.RemoteControlGroup != -1)
                         {
                             locomotive.LocomotivePowerSupply.HandleEventFromLeadLocomotive(evt);
                         }
@@ -343,7 +343,7 @@ protected virtual void AssignScriptFunctions()
                 {
                     foreach (MSTSLocomotive locomotive in Locomotive.Train.Cars.OfType<MSTSLocomotive>())
                     {
-                        if (locomotive != Locomotive && locomotive != Locomotive.Train.LeadLocomotive && locomotive.AcceptMUSignals)
+                        if (locomotive != Locomotive && locomotive != Locomotive.Train.LeadLocomotive && locomotive.RemoteControlGroup != -1)
                         {
                             locomotive.LocomotivePowerSupply.HandleEventFromLeadLocomotive(evt, id);
                         }
@@ -356,7 +356,7 @@ protected virtual void AssignScriptFunctions()
                 {
                     foreach (TrainCar car in Locomotive.Train.Cars)
                     {
-                        if (car != Locomotive && car != Locomotive.Train.LeadLocomotive && car.AcceptMUSignals)
+                        if (car != Locomotive && car != Locomotive.Train.LeadLocomotive && car.RemoteControlGroup != -1)
                         {
                             car.PowerSupply?.HandleEventFromLeadLocomotive(evt);
                         }
@@ -369,7 +369,7 @@ protected virtual void AssignScriptFunctions()
                 {
                     foreach (TrainCar car in Locomotive.Train.Cars)
                     {
-                        if (car != Locomotive && car != Locomotive.Train.LeadLocomotive && car.AcceptMUSignals)
+                        if (car != Locomotive && car != Locomotive.Train.LeadLocomotive && car.RemoteControlGroup != -1)
                         {
                             car.PowerSupply?.HandleEventFromLeadLocomotive(evt, id);
                         }
@@ -380,7 +380,7 @@ protected virtual void AssignScriptFunctions()
             {
                 bool helperFound = false; //this avoids that locomotive engines toggle in opposite directions
 
-                foreach (MSTSDieselLocomotive locomotive in Train.Cars.OfType<MSTSDieselLocomotive>().Where((MSTSLocomotive locomotive) => { return locomotive.AcceptMUSignals; }))
+                foreach (MSTSDieselLocomotive locomotive in Train.Cars.OfType<MSTSDieselLocomotive>().Where((MSTSLocomotive locomotive) => { return locomotive.RemoteControlGroup != -1; }))
                 {
                     if (locomotive == Simulator.PlayerLocomotive)
                     {
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs b/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
@@ -432,7 +432,7 @@ public static Interpolator WorldSummerLatitudetoTemperatureC()
             return new Interpolator(WorldLatitudeDeg, WorldTemperatureSummer);
         }
 
-        public bool AcceptMUSignals = true; //indicates if the car accepts multiple unit signals
+        public bool AcceptMUSignals = true; //indicates if the car accepts multiple unit signals; no more used
         /// <summary>
         /// Indicates which remote control group the car is in.
         /// -1: unconnected, 0: sync/front group, 1: async/rear group
@@ -532,7 +532,7 @@ public float DynamicBrakePercent
             }
             set
             {
-                if (AcceptMUSignals && Train != null)
+                if (RemoteControlGroup != -1 && Train != null)
                     Train.MUDynamicBrakePercent = value;
                 else
                     LocalDynamicBrakePercent = value;
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -2238,7 +2238,7 @@ public void HandleUserInput()
                     foreach (var car in Locomotive.Train.Cars)
                     {
                         dieselLoco = car as MSTSDieselLocomotive;
-                        if (dieselLoco != null && dieselLoco.AcceptMUSignals)
+                        if (dieselLoco != null && dieselLoco.RemoteControlGroup != -1)
                         {
                             if (car == Viewer.Simulator.PlayerLocomotive && dieselLoco.DieselEngines.Count > 1)
                             {

Original file line number	Diff line number	Diff line change
`@@ -1837,7 +1837,7 @@ public override void Update(float elapsedClockSeconds)`
`1837`	`1837`	`{`
`1838`	`1838`	`case Train.TRAINTYPE.AI:`
`1839`	`1839`	`case Train.TRAINTYPE.AI_PLAYERHOSTING:`
`1840`		`- if (AcceptMUSignals)`
	`1840`	`+ if (RemoteControlGroup != -1)`
`1841`	`1841`	`{`
`1842`	`1842`	`if (!LocomotivePowerSupply.MainPowerSupplyOn)`
`1843`	`1843`	`{`
`@@ -5038,7 +5038,7 @@ public virtual float GetDataOf(CabViewControl cvc)`
`5038`	`5038`	`foreach (var car in Train.Cars)`
`5039`	`5039`	`{`
`5040`	`5040`	`var dieselLoco = car as MSTSDieselLocomotive;`
`5041`		`- if (dieselLoco != null && dieselLoco.AcceptMUSignals)`
	`5041`	`+ if (dieselLoco != null && dieselLoco.RemoteControlGroup != -1)`
`5042`	`5042`	`{`
`5043`	`5043`	`if (car == Simulator.PlayerLocomotive && dieselLoco.DieselEngines.Count > 1)`
`5044`	`5044`	`{`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ protected virtual void AssignScriptFunctions()`
`278`	`278`	`{`
`279`	`279`	`DieselEngineState state = DieselEngineState.Unavailable;`
`280`	`280`
`281`		`- foreach (MSTSDieselLocomotive locomotive in Train.Cars.OfType<MSTSDieselLocomotive>().Where((MSTSLocomotive locomotive) => { return locomotive.AcceptMUSignals; }))`
	`281`	`+ foreach (MSTSDieselLocomotive locomotive in Train.Cars.OfType<MSTSDieselLocomotive>().Where((MSTSLocomotive locomotive) => { return locomotive.RemoteControlGroup != -1; }))`
`282`	`282`	`{`
`283`	`283`	`if (locomotive == Simulator.PlayerLocomotive)`
`284`	`284`	`{`
`@@ -330,7 +330,7 @@ protected virtual void AssignScriptFunctions()`
`330`	`330`	`{`
`331`	`331`	`foreach (MSTSLocomotive locomotive in Locomotive.Train.Cars.OfType<MSTSLocomotive>())`
`332`	`332`	`{`
`333`		`- if (locomotive != Locomotive && locomotive != Locomotive.Train.LeadLocomotive && locomotive.AcceptMUSignals)`
	`333`	`+ if (locomotive != Locomotive && locomotive != Locomotive.Train.LeadLocomotive && locomotive.RemoteControlGroup != -1)`
`334`	`334`	`{`
`335`	`335`	`locomotive.LocomotivePowerSupply.HandleEventFromLeadLocomotive(evt);`
`336`	`336`	`}`
`@@ -343,7 +343,7 @@ protected virtual void AssignScriptFunctions()`
`343`	`343`	`{`
`344`	`344`	`foreach (MSTSLocomotive locomotive in Locomotive.Train.Cars.OfType<MSTSLocomotive>())`
`345`	`345`	`{`
`346`		`- if (locomotive != Locomotive && locomotive != Locomotive.Train.LeadLocomotive && locomotive.AcceptMUSignals)`
	`346`	`+ if (locomotive != Locomotive && locomotive != Locomotive.Train.LeadLocomotive && locomotive.RemoteControlGroup != -1)`
`347`	`347`	`{`
`348`	`348`	`locomotive.LocomotivePowerSupply.HandleEventFromLeadLocomotive(evt, id);`
`349`	`349`	`}`
`@@ -356,7 +356,7 @@ protected virtual void AssignScriptFunctions()`
`356`	`356`	`{`
`357`	`357`	`foreach (TrainCar car in Locomotive.Train.Cars)`
`358`	`358`	`{`
`359`		`- if (car != Locomotive && car != Locomotive.Train.LeadLocomotive && car.AcceptMUSignals)`
	`359`	`+ if (car != Locomotive && car != Locomotive.Train.LeadLocomotive && car.RemoteControlGroup != -1)`
`360`	`360`	`{`
`361`	`361`	`car.PowerSupply?.HandleEventFromLeadLocomotive(evt);`
`362`	`362`	`}`
`@@ -369,7 +369,7 @@ protected virtual void AssignScriptFunctions()`
`369`	`369`	`{`
`370`	`370`	`foreach (TrainCar car in Locomotive.Train.Cars)`
`371`	`371`	`{`
`372`		`- if (car != Locomotive && car != Locomotive.Train.LeadLocomotive && car.AcceptMUSignals)`
	`372`	`+ if (car != Locomotive && car != Locomotive.Train.LeadLocomotive && car.RemoteControlGroup != -1)`
`373`	`373`	`{`
`374`	`374`	`car.PowerSupply?.HandleEventFromLeadLocomotive(evt, id);`
`375`	`375`	`}`
`@@ -380,7 +380,7 @@ protected virtual void AssignScriptFunctions()`
`380`	`380`	`{`
`381`	`381`	`bool helperFound = false; //this avoids that locomotive engines toggle in opposite directions`
`382`	`382`
`383`		`- foreach (MSTSDieselLocomotive locomotive in Train.Cars.OfType<MSTSDieselLocomotive>().Where((MSTSLocomotive locomotive) => { return locomotive.AcceptMUSignals; }))`
	`383`	`+ foreach (MSTSDieselLocomotive locomotive in Train.Cars.OfType<MSTSDieselLocomotive>().Where((MSTSLocomotive locomotive) => { return locomotive.RemoteControlGroup != -1; }))`
`384`	`384`	`{`
`385`	`385`	`if (locomotive == Simulator.PlayerLocomotive)`
`386`	`386`	`{`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ public static Interpolator WorldSummerLatitudetoTemperatureC()`
`432`	`432`	`return new Interpolator(WorldLatitudeDeg, WorldTemperatureSummer);`
`433`	`433`	`}`
`434`	`434`
`435`		`- public bool AcceptMUSignals = true; //indicates if the car accepts multiple unit signals`
	`435`	`+ public bool AcceptMUSignals = true; //indicates if the car accepts multiple unit signals; no more used`
`436`	`436`	`/// <summary>`
`437`	`437`	`/// Indicates which remote control group the car is in.`
`438`	`438`	`/// -1: unconnected, 0: sync/front group, 1: async/rear group`
`@@ -532,7 +532,7 @@ public float DynamicBrakePercent`
`532`	`532`	`}`
`533`	`533`	`set`
`534`	`534`	`{`
`535`		`- if (AcceptMUSignals && Train != null)`
	`535`	`+ if (RemoteControlGroup != -1 && Train != null)`
`536`	`536`	`Train.MUDynamicBrakePercent = value;`
`537`	`537`	`else`
`538`	`538`	`LocalDynamicBrakePercent = value;`
Original file line number	Diff line number	Diff line change
`@@ -2238,7 +2238,7 @@ public void HandleUserInput()`
`2238`	`2238`	`foreach (var car in Locomotive.Train.Cars)`
`2239`	`2239`	`{`
`2240`	`2240`	`dieselLoco = car as MSTSDieselLocomotive;`
`2241`		`- if (dieselLoco != null && dieselLoco.AcceptMUSignals)`
	`2241`	`+ if (dieselLoco != null && dieselLoco.RemoteControlGroup != -1)`
`2242`	`2242`	`{`
`2243`	`2243`	`if (car == Viewer.Simulator.PlayerLocomotive && dieselLoco.DieselEngines.Count > 1)`
`2244`	`2244`	`{`