Automatic merge of T1.5.1-1004-g6fd841761e and 25 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 a3bc9e7: Autopilot for timetable mode
- Pull request #946 at 91a03af: Advanced track sounds
- Pull request #949 at da7663b: Oil Burning Locomotive
- Pull request #952 at 8347095: Investigation - Pulsing graphics
- 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 406cba6: Map settings saved
- Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value
- Pull request #960 at c8e2a28: Fix draw state name in scripts
- Pull request #962 at 46d0472: Fix pantographs on unpowered cars
- Pull request #963 at 2d5a67d: Fix dynamic brake force indicator
- Pull request #964 at b11c894: fix: Warning CA1417: Do not use the 'OutAttribute' for string parameter
- Pull request #965 at 7554f02: style: Renormalize line endings
- Pull request #966 at 6353e03: fix: Warning CS0618: 'string.Copy(string)' is obsolete

Author: openrails-bot

Source/ORTS.Menu/ORTimetables.cs

@@ -48,8 +48,8 @@ protected TimetableInfo(string filePath)
                 try
                 {
                     ORTTList.Add(new TimetableFileLite(filePath));
-                    Description = String.Copy(ORTTList[0].Description);
-                    fileName = String.Copy(filePath);
+                    Description = ORTTList[0].Description;
+                    fileName = filePath;
                 }
                 catch
                 {
@@ -70,8 +70,8 @@ protected TimetableInfo(String filePath, String directory)
                 {
                     TimetableGroupFileLite multiInfo = new TimetableGroupFileLite(filePath, directory);
                     ORTTList = multiInfo.ORTTInfo;
-                    Description = String.Copy(multiInfo.Description);
-                    fileName = String.Copy(filePath);
+                    Description = multiInfo.Description;
+                    fileName = filePath;
                 }
                 catch
                 {

Source/Orts.Formats.Msts/SignalConfigurationFile.cs

@@ -750,7 +750,7 @@ static IDictionary<string, SignalDrawState> ReadDrawStates(STFReader stf)
                         SignalDrawState drawState = new SignalDrawState(stf);
                         if (drawStates.ContainsKey(drawState.Name))
                         {
-                            string TempNew = String.Copy("DST");
+                            string TempNew = "DST";
                             TempNew = String.Concat(TempNew,drawStates.Count.ToString());
                             drawStates.Add(TempNew, drawState);
                             STFException.TraceInformation(stf, "Duplicate SignalDrawState name \'"+drawState.Name+"\', using name \'"+TempNew+"\' instead");
@@ -956,7 +956,7 @@ public class SignalDrawState
         public SignalDrawState(string reqName, int reqIndex)
         {
             Index = reqIndex;
-            Name = String.Copy(reqName);
+            Name = reqName;
             DrawLights = null;
         }
 
@@ -1065,7 +1065,7 @@ public class SignalAspect
         public SignalAspect(MstsSignalAspect reqAspect, string reqName)
         {
             Aspect = reqAspect;
-            DrawStateName = String.Copy(reqName);
+            DrawStateName = reqName;
             SpeedMpS = -1;
             Asap = false;
             NoSpeedReduction = false;

Source/Orts.Formats.Msts/SignalScripts.cs

@@ -53,9 +53,9 @@ public class scrReadInfo
 
         public scrReadInfo(string thisString, int thisInt, string thisScript)
         {
-            Readline = String.Copy(thisString);
+            Readline = thisString;
             Linenumber = thisInt;
-            Scriptname = String.Copy(thisScript);
+            Scriptname = thisScript;
         }
     }// class scrReadInfo
 
@@ -390,7 +390,7 @@ public void sigscrRead(string scrFileName, StreamReader scrStream, IDictionary<s
 
                     else
                     {
-                        readInfo.Scriptname = String.Copy(scriptname);
+                        readInfo.Scriptname = scriptname;
                         ScriptLines.Add(readInfo);
 
                         if (readInfo.Linenumber % 1000 == 1)
@@ -716,7 +716,7 @@ public static scrReadInfo scrReadLine(StreamReader scrStream, int lastline)
             }
             else
             {
-                readLine = String.Copy(keepLine);
+                readLine = keepLine;
                 keepLine = String.Empty;
 #if DEBUG_PRINT_IN
                 File.AppendAllText(din_fileLoc + @"sigfile.txt", "From store : " + readLine + "\n");
@@ -1506,7 +1506,7 @@ public static int FindEndCondition(List<scrReadInfo> FECScriptLines, int index)
                     Trace.TraceWarning("sigscr-file line {1} : Missing ) in IF statement ; starting with {0}",
                     presentstring, thisinfo.Linenumber.ToString());
 
-                    string reportString = String.Copy(presentstring);
+                    string reportString = presentstring;
                     if (possibleEnd > 0)
                     {
                         reportString = presentstring.Substring(0, possibleEnd);
@@ -2175,7 +2175,7 @@ public void SCRProcess_TermPartLine(string TermLinePart, ref int sublevel, int i
                             IDictionary<string, uint> LocalFloats, IDictionary<string, SignalFunction> signalFunctions, IList<string> ORNormalSubtypes, int linenumber)
                 {
 
-                    string keepString = String.Copy(TermLinePart);
+                    string keepString = TermLinePart;
                     string procString;
                     string operString;
                     bool syntaxerror = false;
@@ -2288,7 +2288,7 @@ public void SCRProcess_TermPartLine(string TermLinePart, ref int sublevel, int i
                             }
                             else
                             {
-                                procString = String.Copy(keepString);
+                                procString = keepString;
                                 keepString = String.Empty;
                             }
 

Source/Orts.Formats.Msts/TrackDatabaseFile.cs

@@ -1451,7 +1451,7 @@ public PlatformItem(SidingItem thisSiding)
             ItemName = thisSiding.ItemName;
             Flags1 = thisSiding.Flags1;
             LinkedPlatformItemId = thisSiding.LinkedSidingId;
-            Station = String.Copy(ItemName);
+            Station = ItemName;
         }
     }
 

Source/Orts.Formats.OR/AESignals.cs

@@ -2021,7 +2021,7 @@ public AESignalWorldObject(SignalObj SignalWorldItem, SignalConfigurationFile si
 
         public AESignalWorldObject(AESignalWorldObject copy)
         {
-            SFileName = String.Copy(copy.SFileName);
+            SFileName = copy.SFileName;
             Backfacing = copy.Backfacing;
 
             HeadsSet = new bool[copy.HeadsSet.Length];

Source/Orts.Formats.OR/TimetableFile.cs

@@ -118,7 +118,7 @@ public void TTFilePreliminaryRead(String filePath, StreamReader scrStream, Strin
             // process comment row - cell at first comment row and column is description
             // process path and consist row
 
-            Description = String.Copy(filePath);
+            Description = filePath;
 
             bool descFound = false;
             bool pathFound = false;
@@ -136,7 +136,7 @@ public void TTFilePreliminaryRead(String filePath, StreamReader scrStream, Strin
                 {
                     if (String.Compare(Parts[0], "#comment", true) == 0)
                     {
-                        Description = String.Copy(Parts[firstCommentColumn]);
+                        Description = Parts[firstCommentColumn];
                         descFound = true;
                     }
                 }
@@ -146,7 +146,7 @@ public void TTFilePreliminaryRead(String filePath, StreamReader scrStream, Strin
                     {
                         pathFound = true;
                         foreach (TrainInformation train in Trains)
-                            train.Path = String.Copy(Parts[train.Column]);
+                            train.Path = Parts[train.Column];
                     }
                 }
                 if (!consistFound)
@@ -156,7 +156,7 @@ public void TTFilePreliminaryRead(String filePath, StreamReader scrStream, Strin
                         consistFound = true;
                         foreach (TrainInformation train in Trains)
                         {
-                            train.Consist = String.Copy(Parts[train.Column]);
+                            train.Consist = Parts[train.Column];
                             train.LeadingConsist = ExtractConsist(train.Consist, out train.ReverseConsist);
                         }
                     }
@@ -167,7 +167,7 @@ public void TTFilePreliminaryRead(String filePath, StreamReader scrStream, Strin
                     {
                         startFound = true;
                         foreach (TrainInformation train in Trains)
-                            train.StartTime = String.Copy(Parts[train.Column]);
+                            train.StartTime = Parts[train.Column];
                     }
                 }
                 if (!briefingFound)
@@ -177,9 +177,9 @@ public void TTFilePreliminaryRead(String filePath, StreamReader scrStream, Strin
                         briefingFound = true;
 
                         // Newlines "\n" cannot be emdedded in CSV files, so HTML breaks "<br>" are used instead.
-                        Briefing = String.Copy(Parts[1].Replace("<br>", "\n"));
+                        Briefing = Parts[1].Replace("<br>", "\n");
                         foreach (TrainInformation train in Trains)
-                            train.Briefing = String.Copy(Parts[train.Column]).Replace("<br>", "\n");
+                            train.Briefing = Parts[train.Column].Replace("<br>", "\n");
                     }
                 }
 
@@ -192,8 +192,8 @@ private string ExtractConsist(string consistDef, out bool reverse)
         {
             bool isReverse = false;
 
-            string reqString = String.Copy(consistDef);
-            string consistProc = String.Copy(consistDef).Trim();
+            string reqString = consistDef;
+            string consistProc = consistDef.Trim();
 
             if (consistProc.Substring(0, 1).Equals("<"))
             {
@@ -228,7 +228,7 @@ private string ExtractConsist(string consistDef, out bool reverse)
                 }
                 else
                 {
-                    reqString = String.Copy(consistDef);
+                    reqString = consistDef;
 
                     int sepIndex = consistDef.IndexOf('$');
                     if (sepIndex > 0)
@@ -272,7 +272,7 @@ public class TrainInformation : IComparable<TrainInformation>
             public TrainInformation(int column, string train)
             {
                 Column = column;
-                Train = string.Copy(train);
+                Train = train;
                 Consist = string.Empty;
                 LeadingConsist = string.Empty;
                 Path = string.Empty;

Source/Orts.Formats.OR/TimetableGroupFile.cs

@@ -41,7 +41,7 @@ public TimetableGroupFileLite(String filePath, String directory)
                 using (StreamReader scrStream = new StreamReader(filePath, true))
                 {
                     MultiTTFilePreliminaryRead(filePath, directory, scrStream);
-                    if (String.IsNullOrEmpty(Description)) Description = String.Copy(filePath);
+                    if (String.IsNullOrEmpty(Description)) Description = filePath;
                 }
             }
             catch (Exception)
@@ -57,7 +57,7 @@ public TimetableGroupFileLite(String filePath, String directory)
 
         public TimetableGroupFileLite(TimetableFileLite SingleTTInfo)
         {
-            Description = String.Copy(SingleTTInfo.Description);
+            Description = SingleTTInfo.Description;
             ORTTInfo.Add(SingleTTInfo);
         }
 
@@ -102,7 +102,7 @@ public TimetableGroupFile(String filePath, String directory)
                 using (StreamReader scrStream = new StreamReader(filePath, true))
                 {
                     MultiTTFileRead(filePath, directory, scrStream);
-                    if (String.IsNullOrEmpty(Description)) Description = String.Copy(filePath);
+                    if (String.IsNullOrEmpty(Description)) Description = filePath;
                 }
             }
             catch (Exception)

Source/Orts.Simulation/MultiPlayer/Message.cs

@@ -2756,7 +2756,7 @@ public override void HandleMsg()
                 }
                 if (tmpcars2.Count == 0) return;
                 train2.Cars = tmpcars2;
-                train2.Name = String.Concat(String.Copy(train.Name), Train.TotalNumber.ToString());
+                train2.Name = String.Concat(train.Name, Train.TotalNumber.ToString());
                 train2.LeadLocomotive = null;
                 train2.LeadNextLocomotive();
                 train2.CheckFreight();
@@ -2840,7 +2840,7 @@ public override void HandleMsg()
                     train2.TrainType = Train.TRAINTYPE.STATIC;
                     this.oldTrainNumber = train.Number;
                     train2.LastReportedSpeed = 1;
-                    if (train2.Name.Length < 4) train2.Name = String.Concat("STATIC-", String.Copy(train2.Name));
+                    if (train2.Name.Length < 4) train2.Name = String.Concat("STATIC-", train2.Name);
                     MPManager.Simulator.AI.aiListChanged = true;
                     MPManager.Instance().AddOrRemoveLocomotives(user, train, true);
                     MPManager.Instance().AddOrRemoveLocomotives(user, train2, true);

Source/Orts.Simulation/Simulation/AIs/AIPath.cs

@@ -161,7 +161,7 @@ public AIPath(AIPath otherPath)
                 FirstNode.NextSidingNode = Nodes[otherPath.FirstNode.NextSidingNode.Index];
             }
 
-            pathName = String.Copy(otherPath.pathName);
+            pathName = otherPath.pathName;
         }
 
         /// <summary>

Source/Orts.Simulation/Simulation/AIs/AITrain.cs

@@ -160,7 +160,7 @@ public AITrain(Simulator simulator, Service_Definition sd, AI ai, AIPath path, f
             {
                 RandomizeEfficiency(ref Efficiency);
             }
-            Name = String.Copy(name);
+            Name = name;
             TrafficService = trafficService;
             MaxVelocityA = maxVelocityA;
             // <CSComment> TODO: as Cars.Count is always = 0 at this point, activityClearingDistanceM is set to the short distance also for long trains
@@ -6165,15 +6165,15 @@ public virtual String[] AddMovementState(String[] stateString, bool metric)
                         break;
                 }
 
-                retString[7] = String.Copy(actString);
+                retString[7] = actString;
                 retString[8] = FormatStrings.FormatDistance(
                         nextActionInfo.ActivateDistanceM - PresentPosition[0].DistanceTravelledM, metric);
 
             }
 
-            retString[4] = String.Copy(movString);
-            retString[5] = String.Copy(abString);
-            retString[11] = String.Copy(nameString);
+            retString[4] = movString;
+            retString[5] = abString;
+            retString[11] = nameString;
 
             return retString;
         }