Automatic merge of T1.5.1-972-g193ebe1d0 and 14 pull requests

- Pull request #799 at dfc715e: Consolidated wind simulation
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #882 at 48aa537: Blueprint/train car operations UI window
- Pull request #891 at 9a1d6b2: Auto save
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #900 at c27f32d: DMI updates
- Pull request #903 at c296b32: Downloading route content (Github, zip)
- Pull request #912 at 0cb07c2: New Triple Valve Features Vol. 2
- Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t…
- Pull request #922 at abe2e52: Autopilot for timetable mode
- Pull request #923 at 4c27204: Add curve squeal to route
- Pull request #943 at 50d37b7: Dynamic Brakes Behavior & Display Improvements

Author: openrails-bot

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -2222,13 +2222,18 @@ public virtual int GetDrawIndex()
                         Locomotive.DynamicBrakePercent : Locomotive.LocalDynamicBrakePercent;
                     if (dynBrakePercent <= 0)
                             index = 0;
-                    else if (!Locomotive.HasSmoothStruc && Locomotive.DynamicBrakeController != null)
-                        index = Locomotive.DynamicBrakeController.CurrentNotch;
+                    else if (Locomotive.DynamicBrakeController != null)
+                    {
+                        if (!Locomotive.HasSmoothStruc)
+                            index = Locomotive.DynamicBrakeController.CurrentNotch;
+                        else
+                            index = PercentToIndex(Locomotive.DynamicBrakeController.CurrentValue);
+                                }
                                 else
                                     index = PercentToIndex(dynBrakePercent);
                     break;
                 case CABViewControlTypes.CPH_DISPLAY:
-                    if (Locomotive.CombinedControlType == MSTSLocomotive.CombinedControl.ThrottleDynamic && Locomotive.DynamicBrakePercent >= 0)
+                    if (Locomotive.CombinedControlType == MSTSLocomotive.CombinedControl.ThrottleDynamic && Locomotive.DynamicBrakeController?.CurrentValue > 0)
                         // TODO <CSComment> This is a sort of hack to allow MSTS-compliant operation of Dynamic brake indications in the standard USA case with 8 steps (e.g. Dash9)
                         // This hack returns to code of previous OR versions (e.g. release 1.0).
                         // The clean solution for MSTS compliance would be not to increment the percentage of the dynamic brake at first dynamic brake key pression, so that
@@ -2238,8 +2243,8 @@ public virtual int GetDrawIndex()
                         index = PercentToIndex(Locomotive.GetCombinedHandleValue(false));
                     break;
                 case CABViewControlTypes.CP_HANDLE:
-                    if (Locomotive.CombinedControlType == MSTSLocomotive.CombinedControl.ThrottleDynamic && Locomotive.DynamicBrakePercent >= 0
-                            || Locomotive.CombinedControlType == MSTSLocomotive.CombinedControl.ThrottleAir && Locomotive.TrainBrakeController.CurrentValue > 0)
+                    if (Locomotive.CombinedControlType == MSTSLocomotive.CombinedControl.ThrottleDynamic && Locomotive.DynamicBrakeController?.CurrentValue > 0
+                            || Locomotive.CombinedControlType == MSTSLocomotive.CombinedControl.ThrottleAir && Locomotive.TrainBrakeController?.CurrentValue > 0)
                             index = PercentToIndex(Locomotive.GetCombinedHandleValue(false));
                         else
                             index = PercentToIndex(Locomotive.GetCombinedHandleValue(false));