Merge pull request #526 from Csantucci/disappearing-AI

Csantucci · web-flow · commit 99a9aa79ad8e · 2021-11-14T08:47:10.000+01:00
Bug fix for https://bugs.launchpad.net/or/+bug/1949292 AI train disappears after coupling and reversing
diff --git a/Source/Orts.Simulation/Simulation/AIs/AITrain.cs b/Source/Orts.Simulation/Simulation/AIs/AITrain.cs
@@ -4114,6 +4114,8 @@ public virtual bool[] ProcessEndOfPath(int presentTime, bool checkLoop = true)
 
             int directionNow = ValidRoute[0][PresentPosition[0].RouteListIndex].Direction;
             int positionNow = ValidRoute[0][PresentPosition[0].RouteListIndex].TCSectionIndex;
+            int directionNowBack = PresentPosition[1].TCDirection;
+            int positionNowBack = PresentPosition[1].TCSectionIndex;
 
             bool[] nextPart = UpdateRouteActions(0, checkLoop);
 
@@ -4132,7 +4134,7 @@ public virtual bool[] ProcessEndOfPath(int presentTime, bool checkLoop = true)
                          Number.ToString() + " continued, part : " + TCRoute.activeSubpath.ToString() + "\n");
                 }
 
-                if (positionNow == PresentPosition[0].TCSectionIndex && directionNow != PresentPosition[0].TCDirection)
+                if (positionNowBack == PresentPosition[0].TCSectionIndex && directionNowBack != PresentPosition[0].TCDirection)
                 {
                     ReverseFormation(false);
                     // active subpath must be incremented in parallel in incorporated train if present

Original file line number	Diff line number	Diff line change
`@@ -4114,6 +4114,8 @@ public virtual bool[] ProcessEndOfPath(int presentTime, bool checkLoop = true)`
`4114`	`4114`
`4115`	`4115`	`int directionNow = ValidRoute[0][PresentPosition[0].RouteListIndex].Direction;`
`4116`	`4116`	`int positionNow = ValidRoute[0][PresentPosition[0].RouteListIndex].TCSectionIndex;`
	`4117`	`+ int directionNowBack = PresentPosition[1].TCDirection;`
	`4118`	`+ int positionNowBack = PresentPosition[1].TCSectionIndex;`
`4117`	`4119`
`4118`	`4120`	`bool[] nextPart = UpdateRouteActions(0, checkLoop);`
`4119`	`4121`
`@@ -4132,7 +4134,7 @@ public virtual bool[] ProcessEndOfPath(int presentTime, bool checkLoop = true)`
`4132`	`4134`	`Number.ToString() + " continued, part : " + TCRoute.activeSubpath.ToString() + "\n");`
`4133`	`4135`	`}`
`4134`	`4136`
`4135`		`- if (positionNow == PresentPosition[0].TCSectionIndex && directionNow != PresentPosition[0].TCDirection)`
	`4137`	`+ if (positionNowBack == PresentPosition[0].TCSectionIndex && directionNowBack != PresentPosition[0].TCDirection)`
`4136`	`4138`	`{`
`4137`	`4139`	`ReverseFormation(false);`
`4138`	`4140`	`// active subpath must be incremented in parallel in incorporated train if present`