Automatic merge of T1.5.1-1004-g6fd841761e and 18 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 8f695a4: Blueprint/train car operations UI window
- Pull request #885 at 2728d6d: feat: Add notifications to Menu
- 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 3e390b8: Downloading route content (Github, zip)
- Pull request #912 at 359cfee: New Triple Valve Features Vol. 2
- Pull request #922 at abe2e52: Autopilot for timetable mode
- Pull request #946 at 66f836c: Advanced track sounds
- Pull request #949 at d29622b: Oil Burning Locomotive
- Pull request #952 at b2af1f5: Investigation - Pulsing graphics part 1
- Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes
- Pull request #954 at 84c2f4b: Add Support for Multiple Track Profiles
- Pull request #956 at 6adc5a3: Map settings saved

Author: openrails-bot

Source/RunActivity/Viewer3D/Map/MapDataProvider.cs

@@ -249,46 +249,45 @@ public float GetUnusedYLocation(float startX, float wantY, string name)
             var desiredPositionY = (int)(wantY / MapViewer.spacing);  // The positionY of the ideal row for the text.
             var endX = startX + (name.Length * F.trainFont.Size);
 
-            if (endX < 0) // Out of drawing area
+            if ((endX < 0) || // Out of drawing area
+                    (F.alignedTextY == null))
                 return noFreeSlotFound;
 
             var positionY = desiredPositionY;
-            if (F.alignedTextY != null) {
-                while (positionY >= 0 && positionY < F.alignedTextY.Length)
-                {
-                    // If the line contains no text yet, put it there
-                    if (F.alignedTextNum[positionY] == 0)
-                        return SaveLabelLocation(startX, endX, positionY);
+            while (positionY >= 0 && positionY < F.alignedTextY.Length)
+            {
+                // If the line contains no text yet, put it there
+                if (F.alignedTextNum[positionY] == 0)
+                    return SaveLabelLocation(startX, endX, positionY);
 
-                    var conflict = false;
+                var conflict = false;
 
-                    // Check if it intersects with any labels already in this row
-                    for (var col = 0; col < F.alignedTextNum[positionY]; col++)
+                // Check if it intersects with any labels already in this row
+                for (var col = 0; col < F.alignedTextNum[positionY]; col++)
+                {
+                    var v = F.alignedTextY[positionY][col];
+                    //check conflict with a text, v.X is the start of the text, v.Y is the end of the text
+                    if (endX >= v.X && startX <= v.Y)
                     {
-                        var v = F.alignedTextY[positionY][col];
-                        //check conflict with a text, v.X is the start of the text, v.Y is the end of the text
-                        if (endX >= v.X && startX <= v.Y)
-                        {
-                            conflict = true;
-                            break;
-                        }
+                        conflict = true;
+                        break;
                     }
+                }
 
-                    if (conflict)
-                    {
-                        positionY--; // Try a different row: -1, -2, +2, +1
+                if (conflict)
+                {
+                    positionY--; // Try a different row: -1, -2, +2, +1
 
-                        if (positionY - desiredPositionY <= -2) // Cannot move up (-ve Y), so try to move it down (+ve Y)
-                            positionY = desiredPositionY + 2;   // Try +2 then +1
+                    if (positionY - desiredPositionY <= -2) // Cannot move up (-ve Y), so try to move it down (+ve Y)
+                        positionY = desiredPositionY + 2;   // Try +2 then +1
 
-                        if (positionY == desiredPositionY) // Back to original position again
-                            return noFreeSlotFound;
-                    }
-                    else
-                    {
-                        // Check that row has an unused column in its fixed size array
-                        return F.alignedTextNum[positionY] >= F.alignedTextY[positionY].Length ? noFreeSlotFound : SaveLabelLocation(startX, endX, positionY);
-                    }
+                    if (positionY == desiredPositionY) // Back to original position again
+                        return noFreeSlotFound;
+                }
+                else
+                {
+                    // Check that row has an unused column in its fixed size array
+                    return F.alignedTextNum[positionY] >= F.alignedTextY[positionY].Length ? noFreeSlotFound : SaveLabelLocation(startX, endX, positionY);
                 }
             }
             return noFreeSlotFound;