Bug fix for https://bugs.launchpad.net/or/+bug/1983511 When an AI tra…

…in disappears at end of run, containers remain visible
openrails · Aug 7, 2022 · 9664141 · 9664141
1 parent a6c0f04
commit 9664141
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/Source/Orts.Simulation/Simulation/AIs/AI.cs b/Source/Orts.Simulation/Simulation/AIs/AI.cs
@@ -1328,6 +1328,9 @@ private void RemoveTrains()
                         {
                             car.Train = null; // WorldPosition.XNAMatrix.M42 -= 1000;
                             car.IsPartOfActiveTrain = false;  // to stop sounds
+                            // remove continers if any
+                            if (car.FreightAnimations?.Animations != null)
+                                car.FreightAnimations?.RemoveDiscreteFreightAnimations(car as MSTSWagon);
                         }
                     }
                 }

diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
@@ -863,6 +863,22 @@ public bool CheckForMerge(int i)
             }
             return false;
         }
+
+        /// <summary>
+        /// Removes discrete freight animations and containers when AI train is deleted
+        /// </summary>
+
+        public void RemoveDiscreteFreightAnimations(MSTSWagon wagon)
+        {
+            foreach (var animation in Animations)
+            {
+                if (animation is FreightAnimationDiscrete discreteAnimation && discreteAnimation.Container != null)
+                {
+                    wagon.Simulator.ContainerManager.Containers.Remove(discreteAnimation.Container);
+                }
+            }
+
+        }
     }