Merge pull request #531 from Csantucci/dynbrake-display-fix

Csantucci · web-flow · commit 6e47ce88312a · 2021-12-14T16:06:42.000+01:00
Bug fix for https://bugs.launchpad.net/or/+bug/1950578 Dyn Brake setup state not disappearing in cab
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs b/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
@@ -509,7 +509,7 @@ public int GearboxGearIndex
             }
         }
 
-        public float LocalDynamicBrakePercent;
+        public float LocalDynamicBrakePercent = -1;
         public float DynamicBrakePercent
         {
             get
@@ -536,6 +536,8 @@ public float DynamicBrakePercent
                     Train.MUDynamicBrakePercent = value;
                 else
                     LocalDynamicBrakePercent = value;
+                if (Train != null && this == Train.LeadLocomotive)
+                    LocalDynamicBrakePercent = value;
             }
         }
         public Direction Direction
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -1947,7 +1947,10 @@ public int GetDrawIndex()
                     if (Locomotive.DynamicBrakeController != null)
                     {
                         if (dynBrakePercent == -1)
+                        {
+                            index = 0;
                             break;
+                        }
                         if (!Locomotive.HasSmoothStruc)
                         {
                             index = Locomotive.DynamicBrakeController != null ? Locomotive.DynamicBrakeController.CurrentNotch : 0;

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ public int GearboxGearIndex`
`509`	`509`	`}`
`510`	`510`	`}`
`511`	`511`
`512`		`- public float LocalDynamicBrakePercent;`
	`512`	`+ public float LocalDynamicBrakePercent = -1;`
`513`	`513`	`public float DynamicBrakePercent`
`514`	`514`	`{`
`515`	`515`	`get`
`@@ -536,6 +536,8 @@ public float DynamicBrakePercent`
`536`	`536`	`Train.MUDynamicBrakePercent = value;`
`537`	`537`	`else`
`538`	`538`	`LocalDynamicBrakePercent = value;`
	`539`	`+ if (Train != null && this == Train.LeadLocomotive)`
	`540`	`+ LocalDynamicBrakePercent = value;`
`539`	`541`	`}`
`540`	`542`	`}`
`541`	`543`	`public Direction Direction`
Original file line number	Diff line number	Diff line change
`@@ -1947,7 +1947,10 @@ public int GetDrawIndex()`
`1947`	`1947`	`if (Locomotive.DynamicBrakeController != null)`
`1948`	`1948`	`{`
`1949`	`1949`	`if (dynBrakePercent == -1)`
	`1950`	`+ {`
	`1951`	`+ index = 0;`
`1950`	`1952`	`break;`
	`1953`	`+ }`
`1951`	`1954`	`if (!Locomotive.HasSmoothStruc)`
`1952`	`1955`	`{`
`1953`	`1956`	`index = Locomotive.DynamicBrakeController != null ? Locomotive.DynamicBrakeController.CurrentNotch : 0;`