Merge pull request #1004 from mbm-OR/bugfix/Fix-TrainCarOperations-brakehoses-not-sync-coupling-cars

Bugfix/fix train car operations brakehoses not sync coupling cars

Author: mbm-OR

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -1818,8 +1818,12 @@ public void UncoupleBehind(TrainCar car, bool keepFront)
 
             train.UncoupledFrom = train2;
             train2.UncoupledFrom = train;
+            
             train2.SpeedMpS = train.SpeedMpS;
+
+            train.Cars[train.Cars.Count - 1].BrakeSystem.RearBrakeHoseConnected = false;
             train2.Cars[0].BrakeSystem.FrontBrakeHoseConnected = false;
+
             train2.AITrainDirectionForward = train.AITrainDirectionForward;
 
             // It is an action, not just a simple copy, thus don't do it if the train is driven by the player:

Source/RunActivity/Content/TrainOperations/TrainOperationsMap32.png

@@ -75,6 +75,7 @@ public class TrainCarOperationsViewerWindow : Window
         internal static Texture2D RearAngleCockPartial;
         internal static Texture2D ResetBrakesOff;
         internal static Texture2D ResetBrakesOn;
+        internal static Texture2D ResetBrakesWarning;
 
         public List<bool> AngleCockAPartiallyOpened = new List<bool>();
         public List<bool> AngleCockBPartiallyOpened = new List<bool>();
@@ -85,6 +86,8 @@ public class TrainCarOperationsViewerWindow : Window
         public int RowsCount;
         public int SpacerRowCount;
         public int SymbolsRowCount;
+        public bool BrakeHoseCarCoupling;
+
         const int SymbolWidth = 32;
         public static bool FontChanged;
         public static bool FontToBold;
@@ -234,6 +237,7 @@ protected internal override void Initialize()
 
                 Rectangle ResetBrakesOffRect = new Rectangle(64, 256, 32, 32);
                 Rectangle ResetBrakesOnRect = new Rectangle(96, 256, 32, 32);
+                Rectangle ResetBrakesWarningRect = new Rectangle(96, 32, 32, 32);
 
                 var GraphicsDeviceRender = Owner.Viewer.RenderProcess.GraphicsDevice;
                 var TrainOperationsPath = System.IO.Path.Combine(Owner.Viewer.ContentPath, "TrainOperations\\TrainOperationsMap32.png");
@@ -283,6 +287,7 @@ protected internal override void Initialize()
 
                 ResetBrakesOff = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, ResetBrakesOffRect);
                 ResetBrakesOn = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, ResetBrakesOnRect);
+                ResetBrakesWarning = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, ResetBrakesWarningRect);
 
                 PowerOn = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, PowerOnRect);
                 PowerOff = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, PowerOffRect);
@@ -661,7 +666,7 @@ public buttonInitializeBrakes(int x, int y, int size, Viewer viewer, int warning
                 Viewer = viewer;
                 TrainCarViewer = Viewer.TrainCarOperationsViewerWindow;
                 WarningCars = warningCars;
-                Texture = WarningCars > 2 ? ResetBrakesOn : ResetBrakesOff;
+                Texture = WarningCars > 2 ? ResetBrakesOn : WarningCars == 0 ? ResetBrakesOff : ResetBrakesWarning;
                 Source = new Rectangle(0, 0, size, size);
                 Click += new Action<Control, Point>(buttonInitializeBrakes_Click);
             }