Extend checks to state what triggers are enabled

Author: Csantucci

Source/Orts.Simulation/Simulation/AIs/AITrain.cs

@@ -4381,7 +4381,7 @@ public void CoupleAI(Train attachTrain, bool thisTrainFront, bool attachTrainFro
                     AI.AITrains.Add(this);
                     AI.aiListChanged = true;
                 }
-                else if (attachTrain is AITrain) RedefineAITriggers(attachTrain as AITrain);
+                else if (attachTrain is AITrain) attachTrain.RedefineAITriggers();
                 if (!UncondAttach)
                 {
                     RemoveTrain();
@@ -4490,7 +4490,7 @@ public void CoupleAIToStatic(Train attachTrain, bool thisTrainFront, bool attach
             AddTrackSections();
             ResetActions(true);
             physicsUpdate(0);
-            RedefineAITriggers(this);
+            RedefineAITriggers();
         }
 
         //================================================================================================//
@@ -4732,8 +4732,8 @@ public void TerminateCoupling(Train attachTrain, bool thisTrainFront, bool attac
             // Move WP, if any, just under the loco;
             AuxActionsContain.MoveAuxActionAfterReversal(this);
             ResetActions(true);
-            RedefineAITriggers(this);
-            if (attachTrain is AITrain) RedefineAITriggers(attachTrain as AITrain);
+            RedefineAITriggers();
+            if (attachTrain is AITrain) attachTrain.RedefineAITriggers();
             physicsUpdate(0);// Stop the wheels from moving etc
 
         }
@@ -6595,43 +6595,6 @@ public void RestartWaitingTrain(RestartWaitingTrain restartWaitingTrain)
             }
         }
 
-        //================================================================================================//
-        /// <summary>
-        /// Redefine sound triggers for AI trains
-        /// </summary>
-        public void RedefineAITriggers(AITrain train)
-        {
-            var leadFound = false;
-            foreach (var car in train.Cars)
-            {
-                if (car is MSTSLocomotive)
-                {
-                    if (!leadFound)
-                    {
-                        car.SignalEvent(Event.AITrainLeadLoco);
-                        leadFound = true;
-                    }
-                    else car.SignalEvent(Event.AITrainHelperLoco);
-                }
-            }
-        }
-
-        //================================================================================================//
-        /// <summary>
-        /// Redefine sound triggers for Player Train
-        /// </summary>
-        public void RedefinePlayerTrainTriggers(AITrain train)
-        {
-            Simulator.PlayerLocomotive.SignalEvent(Event.PlayerTrainLeadLoco);
-            foreach (var car in train.Cars)
-            {
-                if (car is MSTSLocomotive && car != Simulator.PlayerLocomotive)
-                {
-                    car.SignalEvent(Event.PlayerTrainHelperLoco);
-                }
-            }
-        }
-
     }
 
 

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -1539,7 +1539,7 @@ public void ReverseCars()
             for (var i = 0; i < Cars.Count; i++)
                 Cars[i].Flipped = !Cars[i].Flipped;
             // if AI train redefine first loco for sound
-            if (TrainType == TRAINTYPE.AI) (this as AITrain).RedefineAITriggers(this as AITrain);
+            if (TrainType == TRAINTYPE.AI) RedefineAITriggers();
         }
 
         /// <summary>
@@ -13833,6 +13833,43 @@ public string GetTrainName(string ID)
             return ID.Substring(0, location - 1);
         }
 
+        //================================================================================================//
+        /// <summary>
+        /// Redefine sound triggers for AI trains
+        /// </summary>
+        public void RedefineAITriggers()
+        {
+            var leadFound = false;
+            foreach (var car in Cars)
+            {
+                if (car is MSTSLocomotive)
+                {
+                    if (!leadFound)
+                    {
+                        car.SignalEvent(Event.AITrainLeadLoco);
+                        leadFound = true;
+                    }
+                    else car.SignalEvent(Event.AITrainHelperLoco);
+                }
+            }
+        }
+
+        //================================================================================================//
+        /// <summary>
+        /// Redefine sound triggers for Player Train
+        /// </summary>
+        public void RedefinePlayerTrainTriggers()
+        {
+            Simulator.PlayerLocomotive.SignalEvent(Event.PlayerTrainLeadLoco);
+            foreach (var car in Cars)
+            {
+                if (car is MSTSLocomotive && car != Simulator.PlayerLocomotive)
+                {
+                    car.SignalEvent(Event.PlayerTrainHelperLoco);
+                }
+            }
+        }
+
         //================================================================================================//
 
         /// <summary>

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -1987,7 +1987,7 @@ private void StartSwitchPlayerTrain()
                         // and now switch!
                         playerTrain.TrainType = Train.TRAINTYPE.AI;
                         playerTrain.Autopilot = false;
-                        (playerTrain as AITrain).RedefineAITriggers(playerTrain as AITrain);
+                        playerTrain.RedefineAITriggers();
                         if (TrainSwitcher.SuspendOldPlayer)
                         {
                             playerTrain.MovementState = AITrain.AI_MOVEMENT_STATE.SUSPENDED;
@@ -2187,7 +2187,7 @@ private void CompleteSwitchPlayerTrain()
                 PlayerLocomotive.Train.CreatePathlessPlayerTrain();
             }
             var playerLocomotive = PlayerLocomotive as MSTSLocomotive;
-            (PlayerLocomotive.Train as AITrain).RedefinePlayerTrainTriggers(PlayerLocomotive.Train as AITrain);
+            PlayerLocomotive.Train.RedefinePlayerTrainTriggers();
             playerLocomotive.UsingRearCab = (PlayerLocomotive.Flipped ^ PlayerLocomotive.Train.MUDirection == Direction.Reverse) && (playerLocomotive.HasRearCab || playerLocomotive.HasRear3DCab);
             OnPlayerLocomotiveChanged();
             playerSwitchOngoing = false;

Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs

@@ -2936,6 +2936,7 @@ public override void UpdateAIStaticState(int presentTime)
                     }
 
                     TrainType = TRAINTYPE.PLAYER;
+                    RedefinePlayerTrainTriggers();
                 }
 
                 PostInit(true);
@@ -3874,6 +3875,12 @@ public override void UpdateStationState(float elapsedClockSeconds, int presentTi
 
                         // Reverse formation
                         ReverseFormation(false);
+                        if (TrainType == TRAINTYPE.PLAYER)
+                            RedefinePlayerTrainTriggers();
+                        else if (TrainType == TRAINTYPE.AI)
+                            RedefineAITriggers();
+
+
 
                         // Get new route list indices from new route
                         DistanceTravelledM = 0;