Automatic merge of T1.6-rc7-43-ge3d1d75f9 and 15 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 2e06f85: Automatic speed control
- Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1143 at 84f72b8: Status in Work Orders popup set too fast
- Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content
- Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger
- Pull request #1153 at b6baa4c: Fix TrItems in track viewer (events were over-writing mileposts)
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1124 at fab5457: Built-in PBL2 brake controller
- Pull request #1128 at 278d8ff: Particle Emitter Overhaul

Author: openrails-bot

Source/Contrib/TrackViewer/Drawing/DrawTrackDB.cs

@@ -107,37 +107,14 @@ public RouteData(string routePath, MessageDelegate messageDelegate)
                 //sigcfgFile = null; // default initialization
             }
 
-            // read the activity location events and store them in the TrackDB.TrItemTable
+            // read the activity location events and add them to the TrackDB.TrItemTable
 
             ActivityNames.Clear();
             var directory = System.IO.Path.Combine(routePath, "ACTIVITIES");
             if (System.IO.Directory.Exists(directory))
             {
-                // counting
-                int cnt = 0;
-
-                foreach (var file in Directory.GetFiles(directory, "*.act"))
-                {
-                    try
-                    {
-                        var activityFile = new ActivityFile(file);
-                        Events events = activityFile.Tr_Activity.Tr_Activity_File.Events;
-                        if (events != null)
-                        {
-                            for (int i = 0; i < events.EventList.Count; i++)
-                            {
-                                if (events.EventList[i].GetType() == typeof(EventCategoryLocation))
-                                {
-                                    cnt++;
-                                }
-                            }
-                        }
-                    }
-                    catch { }
-                }
-
-                // adding
-                uint index = 0;
+                int index = TrackDB.TrItemTable.Length;
+                List<TrItem> eventItems = new List<TrItem>();
                 foreach (var file in Directory.GetFiles(directory, "*.act"))
                 {
                     try
@@ -157,8 +134,8 @@ public RouteData(string routePath, MessageDelegate messageDelegate)
                                         eventCategoryLocation.Outcomes.DisplayMessage,
                                         eventCategoryLocation.TileX, eventCategoryLocation.TileZ,
                                         eventCategoryLocation.X, 0, eventCategoryLocation.Z,
-                                        index);
-                                    TrackDB.TrItemTable[index] = eventItem;
+                                        (uint)index);
+                                    eventItems.Add(eventItem);
                                     index++;
                                     found = true;
                                 }
@@ -168,9 +145,18 @@ public RouteData(string routePath, MessageDelegate messageDelegate)
                             ActivityNames.Add(activityFile.Tr_Activity.Tr_Activity_Header.Name);
                         }
                     }
-                    catch { }
+                    catch { /* just ignore activity files with problems */ }
                 }
 
+                // extend the track items array and append the event items
+                if (eventItems.Count > 0)
+                {
+                    int oldSize = TrackDB.TrItemTable.Length;
+                    Array.Resize<TrItem>(ref TrackDB.TrItemTable, index);
+                    int newSize = TrackDB.TrItemTable.Length;
+                    int eventSize = eventItems.Count;
+                    for (int toIdx = oldSize, fromIdx = 0; toIdx < newSize && fromIdx < eventSize; toIdx++, fromIdx++) { TrackDB.TrItemTable[toIdx] = eventItems[fromIdx]; }
+                }
             }
         }