Merge branch 'openrails:master' into multi_track_profiles

Author: SteelFill

Source/ContentChecker/ContentChecker.csproj

@@ -3,8 +3,6 @@
     <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
     <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>Exe</OutputType>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <IsPublishable>False</IsPublishable>
     <AssemblyTitle>Open Rails Content Checker</AssemblyTitle>
     <Description>Open Rails Transport Simulator</Description>

Source/ContentChecker/Loader.cs

@@ -43,7 +43,6 @@
 using System.Linq;
 using System.Text;
 using Microsoft.Xna.Framework.Graphics;
-using System.Windows.Forms;
 
 namespace ContentChecker
 {
@@ -70,7 +69,7 @@ abstract class Loader
         /// <summary> The number of files that were actually loaded </summary>
         public int FilesLoaded { get; protected set; }
         /// <summary> The number of files that were not loaded but skipped </summary>
-        public int FilesSkipped {get; protected set;}
+        public int FilesSkipped { get; protected set; }
 
         /// <summary> The action to take when an additonal file has been identified. This is intended to be set externally </summary>
         protected Action<string, Loader> AddAdditionalFileAction { get; set; }
@@ -158,17 +157,13 @@ protected static GraphicsDevice GetGraphicsDevice()
         {
             if (_graphicsDevice == null)
             {
-                // We use a Windows.Forms Control instead of an xna GAME because it is much easier to use.
-                var _c = new Control();
-
                 // Details probably do not matter too much
                 PresentationParameters parameters = new PresentationParameters()
                 {
                     BackBufferWidth = 100,
                     BackBufferHeight = 100,
                     BackBufferFormat = SurfaceFormat.Color,
                     //DepthStencilFormat = DepthFormat.Depth24,
-                    DeviceWindowHandle = _c.Handle,
                     PresentationInterval = PresentInterval.Immediate,
                     IsFullScreen = false,
                 };

Source/ContentChecker/Program.cs

@@ -77,11 +77,10 @@ static bool OptionsContain(string[] args, IEnumerable<string> optionNames) {
         /// </summary>
         static void ShowHelp()
         {
-            var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
-            Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
+            Console.WriteLine("{0} {1}", ApplicationInfo.ApplicationName, VersionInfo.VersionOrBuild);
             Console.WriteLine();
             Console.WriteLine("Usage:");
-            Console.WriteLine("  {0} [options] <FILE> [...]", Path.GetFileNameWithoutExtension(version.FileName));
+            Console.WriteLine("  {0} [options] <FILE> [...]", Path.GetFileNameWithoutExtension(ApplicationInfo.ProcessFile));
             Console.WriteLine();
             Console.WriteLine("Arguments:");
             Console.WriteLine("  <FILE>           Data files to check; may contain wildcards");

Source/Contrib/DataCollector/Program.cs

@@ -19,7 +19,6 @@
 using ORTS.Common;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 
@@ -39,11 +38,10 @@ static void Main(string[] args)
 
         static void ShowHelp()
         {
-            var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
-            Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
+            Console.WriteLine("{0} {1}", ApplicationInfo.ApplicationName, VersionInfo.VersionOrBuild);
             Console.WriteLine();
             Console.WriteLine("Usage:");
-            Console.WriteLine("  {0} [options] [<PATH> [...]]", Path.GetFileNameWithoutExtension(version.FileName));
+            Console.WriteLine("  {0} [options] [<PATH> [...]]", Path.GetFileNameWithoutExtension(ApplicationInfo.ProcessFile));
             Console.WriteLine();
             Console.WriteLine("Arguments:");
             Console.WriteLine("  <PATH>         Directories to scan for specific options");

Source/Contrib/DataConverter/Program.cs

@@ -17,7 +17,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
@@ -87,11 +86,10 @@ static void Main(string[] args)
 
         static void ShowHelp(List<IDataConverter> converters)
         {
-            var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
-            Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
+            Console.WriteLine("{0} {1}", ApplicationInfo.ApplicationName, VersionInfo.VersionOrBuild);
             Console.WriteLine();
             Console.WriteLine("Usage:");
-            Console.WriteLine("  {0} /input <INPUT> [/output] [<OUTPUT> [...]]", Path.GetFileNameWithoutExtension(version.FileName));
+            Console.WriteLine("  {0} /input <INPUT> [/output] [<OUTPUT> [...]]", Path.GetFileNameWithoutExtension(ApplicationInfo.ProcessFile));
             Console.WriteLine();
             Console.WriteLine("Arguments:");
             Console.WriteLine("  <INPUT>   Specifies the file to read");

Source/Contrib/DataValidator/Program.cs

@@ -39,11 +39,10 @@ static void Main(string[] args)
 
         static void ShowHelp()
         {
-            var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
-            Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
+            Console.WriteLine("{0} {1}", ApplicationInfo.ApplicationName, VersionInfo.VersionOrBuild);
             Console.WriteLine();
             Console.WriteLine("Usage:");
-            Console.WriteLine("  {0} [options] <FILE> [...]", Path.GetFileNameWithoutExtension(version.FileName));
+            Console.WriteLine("  {0} [options] <FILE> [...]", Path.GetFileNameWithoutExtension(ApplicationInfo.ProcessFile));
             Console.WriteLine();
             Console.WriteLine("Arguments:");
             Console.WriteLine("  <FILE>    Data files to validate; may contain wildcards");

Source/Contrib/SimulatorTester/Program.cs

@@ -21,9 +21,7 @@
 using Orts.Simulation;
 using ORTS.Common;
 using System.IO;
-using System.Windows.Forms;
 using Orts.Common;
-using System.Diagnostics;
 
 namespace SimulatorTester
 {
@@ -37,23 +35,22 @@ static void Main(string[] args)
 
             if (files.Count != 1 || options.Contains("help", StringComparer.InvariantCultureIgnoreCase))
             {
-                var version = FileVersionInfo.GetVersionInfo(Application.ExecutablePath);
-                Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
+                Console.WriteLine("{0} {1}", ApplicationInfo.ApplicationName, VersionInfo.VersionOrBuild);
                 Console.WriteLine();
                 Console.WriteLine("Usage:");
-                Console.WriteLine("  {0} [options] <SAVE_FILE>", Path.GetFileNameWithoutExtension(Application.ExecutablePath));
+                Console.WriteLine("  {0} [options] <SAVE_FILE>", Path.GetFileNameWithoutExtension(ApplicationInfo.ProcessFile));
                 Console.WriteLine();
                 Console.WriteLine("Arguments:");
-                Console.WriteLine("  <SAVE_FILE>  {0} save file to use", Application.ProductName);
+                Console.WriteLine("  <SAVE_FILE>  {0} save file to use", ApplicationInfo.ProductName);
                 Console.WriteLine();
                 Console.WriteLine("Options:");
                 Console.WriteLine("  /quiet       Do not show summary of simulation (only exit code is set)");
-                Console.WriteLine("  /verbose     Show version and settings (similar to a {0} log)", Application.ProductName);
+                Console.WriteLine("  /verbose     Show version and settings (similar to a {0} log)", ApplicationInfo.ProductName);
                 Console.WriteLine("  /fps <FPS>   Set the simulation frame-rate [default: 10]");
                 Console.WriteLine("  /help        Show help and usage information");
-                Console.WriteLine("  ...and any standard {0} option", Application.ProductName);
+                Console.WriteLine("  ...and any standard {0} option", ApplicationInfo.ProductName);
                 Console.WriteLine();
-                Console.WriteLine("The {0} takes a save file and:", version.FileDescription);
+                Console.WriteLine("The {0} takes a save file and:", ApplicationInfo.ApplicationName);
                 Console.WriteLine("  - Loads the same activity as contained in the save file");
                 Console.WriteLine("  - Runs the simulation at the specified FPS for the same duration as the save file");
                 Console.WriteLine("  - Compares the final position with that contained in the save file");
@@ -65,15 +62,15 @@ static void Main(string[] args)
 
             if (settings.Verbose)
             {
-                Console.WriteLine("This is a log file for {0}. Please include this file in bug reports.", Application.ProductName);
+                Console.WriteLine("This is a log file for {0}. Please include this file in bug reports.", ApplicationInfo.ProductName);
                 LogSeparator();
 
                 SystemInfo.WriteSystemDetails(Console.Out);
                 LogSeparator();
 
                 Console.WriteLine("Version      = {0}", VersionInfo.Version.Length > 0 ? VersionInfo.Version : "<none>");
                 Console.WriteLine("Build        = {0}", VersionInfo.Build);
-                Console.WriteLine("Executable   = {0}", Path.GetFileName(Application.ExecutablePath));
+                Console.WriteLine("Executable   = {0}", Path.GetFileName(ApplicationInfo.ProcessFile));
                 foreach (var arg in args)
                     Console.WriteLine("Argument     = {0}", arg);
                 LogSeparator();

Source/Contrib/SimulatorTester/SimulatorTester.csproj

@@ -6,9 +6,6 @@
     <RootNamespace>Orts.SimulatorTester</RootNamespace>
     <AssemblyName>Contrib.SimulatorTester</AssemblyName>
     <ApplicationIcon>..\..\ORTS.ico</ApplicationIcon>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <OutputPath>..\..\..\Program\</OutputPath>
     <IsPublishable>False</IsPublishable>
     <AssemblyTitle>Open Rails Simulator Tester (Contributed)</AssemblyTitle>
     <Description>Open Rails Transport Simulator</Description>

Source/Documentation/Manual/cruisecontrol.rst

@@ -138,6 +138,9 @@ A list of the available .eng file CC parameters follows here below.
    "ModeSwitchAllowedWithThrottleNotAtZero", "Switch from manual to auto and vice-versa can occur also when throttle lever is not at 0", "Boolean", "FALSE"
    "DisableManualSwitchToAutoWhenSetSpeedNotAtTop", "Manual Switch to Cruise Control Auto Mode can't occur when speed is not set at maximum value and at the same moment train speed is not 0", "Boolean", "FALSE"
    "UseTrainBrakeAndDynBrake", "CC uses train brake and dyn brake together", "Boolean", "FALSE"
+   "UseDynBrake", "CC uses dyn brake", "Boolean", "TRUE"
+   "TrainBrakeCommandHasPriorityOverCruiseControl", "A manual train braking inhibits Cruise Control to use both dynamic braking and tractive force", "Boolean", "TRUE"
+   "TrainBrakeCommandHasPriorityOverAcceleratingCruiseControl", "A manual train braking inhibits Cruise Control to use tractive force", "Boolean", "TRUE"
    "SpeedDeltaToEnableTrainBrake", "This is the minimum speed delta between actual speed and desired speed for the CC to use also the train brake", "Float(speed)", "5m/s"
    "SpeedDeltaToEnableFullTrainBrake", "This is the minimum speed delta between actual speed and desired speed for the CC to use also the train brake with no reduced intensity", "Float(speed)", "10m/s"
    "TrainBrakeMinPercentValue", "This is the minimum train brake percent used by the CC. 0 means no braking, 100 means full service braking", "Float(percent)", "30"

Source/Documentation/Manual/driving.rst

@@ -1411,7 +1411,8 @@ Changing the Train Driven by the Player
 General
 -------
 
-This function only works in activity mode, and allows the player to select 
+This function works in activity mode as well as in timetable mode, 
+and allows the player to select 
 another (existing) train from a list and to start driving it.
 
 This function can be called more than once. A new information window has 
@@ -1453,17 +1454,20 @@ completely appeared on the screen - if it is far away from the player train
 this can require several seconds to load the *world* around the train) the 
 switch of control occurs. 
 
-The AI train string now becomes red and is moved to the first position.The 
-train can be driven, or set to autopilot mode. The former player train 
-becomes an AI train.
+The AI train string now becomes red and is moved to the first position.
+In timetable mode the new player train is automatically set to autopilot mode,
+while this does not apply to activity mode. However in both timetable and 
+activity mode the player can switch forth and back to autopilot mode. 
+The former player train becomes an AI train.
 
 Here is the final situation:
 
 .. image:: images/driving-train-list-3.png
     :align: center
     :scale: 80%
 
-If the second left-click was performed with the Shift key down, the former 
+In activity mode only, if the second left-click was performed with the Shift 
+key down, the former 
 player train still becomes an AI train, but it is put in a suspended mode 
 (only if its speed is 0). It won't move until it becomes a player train 
 again. A suspended train is shown in orange color on the Train List window.
@@ -1472,7 +1476,8 @@ The new player train can can be switched to manual mode, can also request to
 pass signals at danger with the ``<Tab>`` command, and can be moved outside 
 of its original path. However before switching control to still another train, 
 the new player train must be returned to the original path or put in suspend 
-mode; or else it will disappear, as occurs for AI trains running outside their 
+mode (last is possible only in activity mode); or else it will disappear, 
+as occurs for AI trains running outside their 
 path.
 
 The sequence may be restarted to switch to a new train or to switch back to 
@@ -1482,15 +1487,9 @@ Train switching also works in activity mode together with multiplayer mode,
 in the sense that the dispatcher player can switch its played train, and 
 the related information is sent to the client players.
 
-The Train List window is also available in 
-:ref:`Timetable mode <start-timetable>`. In this case the 
-names of all trains except the player train are shown in white (they can't 
-be driven), however with a single click on a train in the window the 
-external view cameras become linked to that train, as occurs with the Alt-9 
-command described :ref:`further below <driving-changing-view>`.
 
-Switching to a static train
----------------------------
+Switching to a static train (only activity mode)
+------------------------------------------------
 
 In the Train List window the drivable static consists (that is the ones 
 that have at least an engine provided with a cab) are also listed (in