Merge pull request #793 from Roeterdink/CorrectErrorsTurntable

Correct errors in Turntables.cs
openrails · Feb 27, 2023 · e810f47 · e810f47
2 parents 4757b00 + 8897021
commit e810f47
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Source/Orts.Simulation/Simulation/Turntables.cs b/Source/Orts.Simulation/Simulation/Turntables.cs
@@ -179,9 +179,9 @@ public virtual void Restore(BinaryReader inf, Simulator simulator)
             }
 
             int trainsInQ = inf.ReadInt32();
-            for (int iQ = 0; iQ < trainsInQ - 1; iQ++)
+            for (int iQ = 0; iQ < trainsInQ; iQ++)
             {
-                Q.Enqueue(iQ);
+                Q.Enqueue(inf.ReadInt32());
             }
         }
 
@@ -723,9 +723,12 @@ public void RotateTrain(Matrix animationXNAMatrix)
                 var iRelativeCarPositions = 0;
                 foreach (TrainCar traincar in TrainsOnMovingTable[0].Train.Cars)
                 {
-                    traincar.WorldPosition.XNAMatrix = Matrix.Multiply(RelativeCarPositions[iRelativeCarPositions], AnimationXNAMatrix);
-                    traincar.UpdateFreightAnimationDiscretePositions();
-                    iRelativeCarPositions++;
+                    if (RelativeCarPositions != null)
+                    {
+                        traincar.WorldPosition.XNAMatrix = Matrix.Multiply(RelativeCarPositions[iRelativeCarPositions], AnimationXNAMatrix);
+                        traincar.UpdateFreightAnimationDiscretePositions();
+                        iRelativeCarPositions++;
+                    }
                 }
             }
         }