fix: Separate switch and crossover detection for flexibility

Author: twpol

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -3108,7 +3108,7 @@ public virtual void UpdateWaterTroughRefill(float elapsedClockSeconds, float abs
                     Simulator.Confirmer.Message(ConfirmLevel.Error, Simulator.Catalog.GetString("Scoop is broken, can't refill"));
                     RefillingFromTrough = false;
                 }
-                else if (IsOverJunction)
+                else if (IsOverSwitch || IsOverCrossover)
                 {
                     if (!ScoopIsBroken) // Only display message first time scoop is broken
                     {

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -3093,7 +3093,8 @@ private void AddVibrations(float factor)
         }
         #endregion
 
-        public bool IsOverJunction { get; private set; }
+        public bool IsOverSwitch { get; private set; }
+        public bool IsOverCrossover { get; private set; }
         public bool IsOverTrough { get; private set; }
 
         void UpdatePositionFlags()
@@ -3107,7 +3108,8 @@ void UpdatePositionFlags()
                 rearOffsetM += Train.Cars[i - 1].CouplerSlackM + Train.Cars[i - 1].GetCouplerZeroLengthM() + Train.Cars[i].CarLengthM;
             var frontOffsetM = rearOffsetM + CarLengthM;
 
-            var isOverJunction = false;
+            var isOverSwitch = false;
+            var isOverCrossover = false;
             var isOverTrough = false;
 
             // Scan through the track sections forwards from the REAR of the train (`Train.PresentPosition[1]`),
@@ -3122,7 +3124,8 @@ void UpdatePositionFlags()
                 // Does this car overlap this track section?
                 if (checkedM <= frontOffsetM && rearOffsetM <= checkedM + section.Length)
                 {
-                    if (section.CircuitType == TrackCircuitSection.TrackCircuitType.Junction || section.CircuitType == TrackCircuitSection.TrackCircuitType.Crossover) isOverJunction = true;
+                    if (section.CircuitType == TrackCircuitSection.TrackCircuitType.Junction) isOverSwitch = true;
+                    if (section.CircuitType == TrackCircuitSection.TrackCircuitType.Crossover) isOverCrossover = true;
                     if (section.TroughInfo != null)
                     {
                         foreach (var troughs in section.TroughInfo)
@@ -3139,7 +3142,8 @@ void UpdatePositionFlags()
                 currentPin = nextPin;
             }
 
-            IsOverJunction = isOverJunction;
+            IsOverSwitch = isOverSwitch;
+            IsOverCrossover = isOverCrossover;
             IsOverTrough = isOverTrough;
         }
 

Source/RunActivity/Viewer3D/Sound.cs

@@ -395,7 +395,7 @@ public bool UpdateCarOnSwitchAndCurve()
 
                     var CarBehind = Car.Train.Cars[CarNo + CarIncr];
                     var carPreviouslyOnSwitch = CarOnSwitch;
-                    CarOnSwitch = Car.IsOverJunction;
+                    CarOnSwitch = Car.IsOverSwitch || Car.IsOverCrossover;
 
                     // here check for curve
                     var carPreviouslyOnCurve = CarOnCurve;