Bug fix for http://www.elvastower.com/forums/index.php?/topic/36129-p…

…layer-trainlead-locomotive-must-be-player-locomotive-crash/ Bug fix for AI trains couple/uncouple
openrails · Apr 4, 2022 · b24ab3d · b24ab3d
1 parent 5b6d345
commit b24ab3d
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/Source/Orts.Simulation/Simulation/AIs/AITrain.cs b/Source/Orts.Simulation/Simulation/AIs/AITrain.cs
@@ -3215,6 +3215,16 @@ public virtual void UpdateFollowingState(float elapsedClockSeconds, int presentT
                                     AdjustControlsAccelMore(0.5f * MaxAccelMpSS, elapsedClockSeconds, 10);
                                 }
                             }
+                            if (OtherTrain.UncoupledFrom == this)
+                            {
+                                if (distanceToTrain > 5.0f)
+                                {
+                                    UncoupledFrom = null;
+                                    OtherTrain.UncoupledFrom = null;
+                                }
+                                else
+                                    attachToTrain = false;
+                            }
                             //                            if (distanceToTrain < keepDistanceStatTrainM_P - 4.0f || (distanceToTrain - brakingDistance) <= keepDistanceTrainM) // Other possibility
                             if ((distanceToTrain - brakingDistance) <= keepDistanceTrainM)
                             {
@@ -4600,6 +4610,7 @@ public void LeaveCarsToLivingTrain(Train attachTrain, bool thisTrainFront, bool
                             attachTrain.Cars.Insert(0, car);
                             car.Train = attachTrain;
                             car.Flipped = !car.Flipped;
+                            if (attachTrain.IsActualPlayerTrain && attachTrain.LeadLocomotiveIndex != -1) attachTrain.LeadLocomotiveIndex++;
                         }
                         else
                         {
@@ -4635,6 +4646,7 @@ public void LeaveCarsToLivingTrain(Train attachTrain, bool thisTrainFront, bool
                         {
                             attachTrain.Cars.Insert(0, car);
                             car.Train = attachTrain;
+                            if (attachTrain.IsActualPlayerTrain && attachTrain.LeadLocomotiveIndex != -1) attachTrain.LeadLocomotiveIndex++;
                         }
                         passedLength += car.CarLengthM;
                         attachTrain.Length += car.CarLengthM;
@@ -4683,6 +4695,7 @@ public void StealCarsToLivingTrain(Train attachTrain, bool thisTrainFront, bool
                         Length += car.CarLengthM;
                         attachTrain.Length -= car.CarLengthM;
                         attachTrain.Cars.Remove(car);
+                        if (attachTrain.IsActualPlayerTrain && attachTrain.LeadLocomotiveIndex != -1) attachTrain.LeadLocomotiveIndex--;
                     }
                 }
                 attachTrain.Cars[0].SignalEvent(Event.Couple);