Merge branch 'master' into Freightanims-for-3DCabs

Csantucci · Csantucci · commit 4325f35bc79d · 2019-07-14T17:12:36.000+02:00
diff --git a/Build.cmd b/Build.cmd
@@ -197,7 +197,7 @@ IF "%Mode%" == "Stable" (
 
 REM Create binary and source zips.
 CALL :delete "OpenRails-%Mode%*.zip" || GOTO :error
-PUSHD "Program" && 7za.exe a -r -tzip "..\OpenRails-%Mode%.zip" . && POPD || GOTO :error
+PUSHD "Program" && 7za.exe a -r -tzip -x^^!*.xml "..\OpenRails-%Mode%.zip" . && POPD || GOTO :error
 7za.exe a -r -tzip -x^^!.* -x^^!obj -x^^!lib -x^^!_build -x^^!*.bak -x^^!Website "OpenRails-%Mode%-Source.zip" "Source" || GOTO :error
 
 ENDLOCAL
diff --git a/Source/Orts.Simulation/Simulation/Physics/Train.cs b/Source/Orts.Simulation/Simulation/Physics/Train.cs
@@ -15521,14 +15521,14 @@ public TCRoutePath(AIPath aiPath, int orgDir, float thisTrainLength, Signals org
                                 newDir = junctionNode.TrPins[firstpin].Direction;
                             }
                         }
-
-                        currentDir = newDir;
-
                         //
                         // find next junction path node
                         //
-
                         nextPathNode = thisPathNode.NextMainNode;
+
+                        // if we were on last main node, direction was already set
+                        if (nextPathNode != null) currentDir = newDir;
+
                     }
                     else
                     {

Original file line number	Diff line number	Diff line change
`@@ -15521,14 +15521,14 @@ public TCRoutePath(AIPath aiPath, int orgDir, float thisTrainLength, Signals org`
`15521`	`15521`	`newDir = junctionNode.TrPins[firstpin].Direction;`
`15522`	`15522`	`}`
`15523`	`15523`	`}`
`15524`		`-`
`15525`		`- currentDir = newDir;`
`15526`		`-`
`15527`	`15524`	`//`
`15528`	`15525`	`// find next junction path node`
`15529`	`15526`	`//`
`15530`		`-`
`15531`	`15527`	`nextPathNode = thisPathNode.NextMainNode;`
	`15528`	`+`
	`15529`	`+ // if we were on last main node, direction was already set`
	`15530`	`+ if (nextPathNode != null) currentDir = newDir;`
	`15531`	`+`
`15532`	`15532`	`}`
`15533`	`15533`	`else`
`15534`	`15534`	`{`