Merge pull request #1140 from SteelFill/control_animation_fix

Fix Cabview Animation Edge Case

Author: twpol

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -1150,9 +1150,10 @@ public CVCDiscrete(STFReader stf, string basepath, DiscreteStates discreteState)
                         if (Positions.Count > 0 && Positions[0] > Positions[Positions.Count - 1])
                         {
                             Reversed ^= true;
+                            int maxPos = Positions.Max();
                             // Recalculate positions in reverse
                             for (int i = 0; i < Positions.Count; i++)
-                                Positions[i] = (FramesCount - 1) - Positions[i];
+                                Positions[i] = maxPos - Positions[i];
                         }
 
                         // Check if eligible for filling

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -4191,7 +4191,7 @@ public void StartThrottleToZero(float? target)
         /// Returns the position of the throttle handle considering 
         /// whether it is used for cruise control or not
         /// </summary>
-        /// <param name="intermediateValue">Whather asking for intermediate (for mouse operation) or notched (for displaying) value.</param>
+        /// <param name="intermediateValue">Whether asking for intermediate (for mouse operation) or notched (for displaying) value.</param>
         /// <returns>Position into 0-1 range</returns>
         public float GetThrottleHandleValue(bool intermediateValue)
         {
@@ -4203,7 +4203,7 @@ public float GetThrottleHandleValue(bool intermediateValue)
             if (CruiseControl?.SpeedRegMode == CruiseControl.SpeedRegulatorMode.Auto && CruiseControl.UseThrottleAsSpeedSelector)
                 return CruiseControl.SelectedSpeedMpS / MaxSpeedMpS;
 
-            return intermediateValue ? ThrottleController.CurrentValue : ThrottleController.IntermediateValue;
+            return intermediateValue ? ThrottleController.IntermediateValue : ThrottleController.CurrentValue;
         }
 
         #endregion