Automatic merge of T1.6-rc2-41-gacd714487 and 8 pull requests

openrails-bot · openrails-bot · commit cf6e63bdb1b3 · 2025-06-25T22:07:40.000+01:00
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2391bc0: Automatic speed control - Pull request #1107 at f5eb3dc: Fix DPMode when last remote is moved to front. - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - Pull request #1114 at 9a4a873: Fix color of DB in DrivingInfo when in setup with DPU fenced. - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1104 at f40920a: Handle simple adhesion within the axle module - Pull request #1081 at 689494b: Brake cuts power unification
diff --git a/Source/Installer/Installer.iss b/Source/Installer/Installer.iss
@@ -20,7 +20,7 @@
 
 #define DotNETName "Microsoft .NET Framework 4.7.2"
 
-#define MyAppURL "http://openrails.org" ; Not yet HTTPS
+#define MyAppURL "https://openrails.org"
 #define MyAppSourceURL "http://openrails.org/download/source/"
 #define MyAppSupportURL "https://launchpad.net/or"
 
@@ -31,7 +31,7 @@
 #define MyAppDocPath "..\..\Program\Documentation"
 
 #define NetRedistPath "..\..\.NET Framework 4.7.2 web installer"
-#define NetRedist "NDP472-KB4054531-Web.exe"
+#define NetRedist "ndp472-kb4054531-web.exe" ; Has to be lower-case to match download
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -50,20 +50,26 @@ DefaultDirName  ={commonpf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons    =yes
 LicenseFile     ={#MyAppProgPath}\Copying.txt
-InfoBeforeFile   ={#MyAppProgPath}\Prerequisites.txt
+InfoBeforeFile  ={#MyAppProgPath}\Prerequisites.txt
 InfoAfterFile   ={#MyAppProgPath}\Readme.txt
 
-; Remove the following line to run in administrative install mode (install for all users.)
-; PrivilegesRequired=lowest ; Cannot create the directory C:\Program Files\Open Rails
+; Prompt for a destination folder
+DisableDirPage  =no
+; 32-bit is the default, installing in "Program Files (x86)" on 64-bit Windows. "x64compatible" uses Program Files on 64-bit Windows
+ArchitecturesInstallIn64BitMode =x64compatible
+
+; Default is admin install mode.
+; Comment in the following line to run in non-administrative install mode, but that cannot create the directory C:\Program Files\Open Rails
+; PrivilegesRequired=lowest
 
 Compression     =lzma
 SolidCompression=yes
-WizardStyle=modern
+WizardStyle     =modern
 Uninstallable   =yes
-UninstallDisplayIcon={app}\{#MyAppExeName}
-OutputBaseFilename=OpenRailsSetup
+UninstallDisplayIcon ={app}\{#MyAppExeName}
+OutputBaseFilename =OpenRailsSetup
 
-; Windows 7 SP1
+; Windows 7 SP1 Correct value, so ignore final warning message from Build > Compile
 MinVersion      =6.1sp1
 
 [Languages]
@@ -79,7 +85,7 @@ Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"
 Name: "german"; MessagesFile: "compiler:Languages\German.isl"
 Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
-Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl"
+;Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl"
 Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
 Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
diff --git a/Source/Installer/Using the installer scripts.txt b/Source/Installer/Using the installer scripts.txt
@@ -1,19 +1,24 @@
 Using the installer scripts.txt
-Last updated: 2022-08-21 by Chris Jakeman
+Last updated: 2025-06-21 by Chris Jakeman
 
-1. If you wish to update the version name from "1.5", then edit the line
-     #define MyAppVersion "1.5"
+Compiling the scripts and data files on your own PC and testing them there or on a virtual machine
+==================================================================================================
+
+1. If you wish to update the version name from "1.6", then edit the line
+     #define MyAppVersion "1.6"
 	 in the file 
    Source\Installer\Version.iss
      and update the Release number and date in:
    Source\RunActivity\Readme.txt
      and in
    Source\RunActivity\Prerequisites.txt
    
+   The text in these documents is shown by the Installer to the user, so check this is still up to date.
+   
 2. Download and install Inno Setup from http://www.jrsoftware.org/isdl.php
-Initial trials (Apr 2014) used v5.5.4. Open Rails v1.5 uses 6.1.2
+Initial trials (Apr 2014) used v5.5.4. Open Rails v1.6 uses 6.4.3
 
-3. Download Microsoft .NET Framework 4.7.2 web installer for Windows from:
+3. Download Microsoft .NET Framework 4.7.2 web installer package for Windows from:
     https://support.microsoft.com/en-us/topic/microsoft-net-framework-4-7-2-web-installer-for-windows-dda5cddc-b85e-545d-8d4a-d213349b7775
    and save in
   <A>\.NET Framework 4.7.2 web installer\ndp472-kb4054531-web.exe
@@ -23,28 +28,31 @@ Initial trials (Apr 2014) used v5.5.4. Open Rails v1.5 uses 6.1.2
    From Source\Installer, copy OpenRails.iss and Version.iss into <A>\Temp\Installer
   
 5. Repeat the following as often as required:
-  A. Download OR zip file from https://github.com/openrails/openrails/releases, choose the latest (i.e. pre-release) version, open the Assets concertina and pick OpenRails-Stable.zip
+  A. Download OR zip file from https://github.com/openrails/openrails/releases, choose the latest (i.e. pre-release) version, open the Assets concertina and pick Open Rails <version>.zip where <version> is something like "1.6-rc2"
 
   B. Unzip into folder 
-    <A>\Open Rails\Program\
+    <A>\Program\
 
   C. Remove 
-    <A>\Open Rails\Program\Updater.ini 
+    <A>\Program\Updater.ini 
   as James Ross advises because the updater cannot update an installed version yet.
 
-  D. Download source from https://github.com/openrails/openrails/releases, choose the latest (i.e. pre-release) version, open the Assets concertina and pick Source code (openrails-1.5-rc1.zip) and extract the folder Source\Documentation.
+  D. Download source from https://github.com/openrails/openrails/releases, choose the latest (i.e. pre-release) version, open the Assets concertina and pick Source code Open Rails <version> Source.zip where <version> is something like "1.6-rc2" and extract the folder Source\Documentation.
 
   E. Copy contents into folder
-    <A>\Open Rails\Program\Documentation\
+    <A>\Program\Documentation\
+	
+  F. If you made changes to Source\RunActivity\Readme.txt or Source\RunActivity\Prerequisites.txt in Step 1, then
+  copy them to <A>\Program\ to overwrite the downloaded files.
 
-  F. Use Inno Setup > Build > Compile to compile the installer script
+  G. Use Inno Setup Compiler > Build > Compile to compile the installer script
     <A>\Temp\Installer\Installer.iss
 	and generate the Open Rails Installer
   
-  G. The generated file will be found in <A>\Temp\Installer\Output\OpenRailsSetup.exe
+  H. The generated file will be found in <A>\Temp\Installer\Output\OpenRailsSetup.exe
  
 6. Test the installer by building Virtual Machines with a fresh copy of Windows.
-Open Rails v1.5 is compatible with Windows from 7 (SP1) to 11 and, hopefully, beyond.
+Open Rails v1.6 is compatible with Windows from 7 (SP1) to 11 and, hopefully, beyond.
 
 Arrange for the VM to have Internet access and a shared folder.
 Copy OpenRailsSetup.exe to the shared folder.
diff --git a/Source/Installer/Version.iss b/Source/Installer/Version.iss
@@ -1 +1 @@
-#define MyAppVersion "none"
+#define MyAppVersion "1.6"
diff --git a/Source/Orts.Simulation/Simulation/Activity.cs b/Source/Orts.Simulation/Simulation/Activity.cs
@@ -884,6 +884,8 @@ public override void NotifyEvent(ActivityEventType EventType)
                         double sinceActArriveS = (new DateTime().Add(TimeSpan.FromSeconds(Simulator.ClockTime))
                                                 - ActArrive).Value.TotalSeconds;
                         BoardingEndS -= sinceActArriveS;
+
+                        ldbfevaldepartbeforeboarding = false; // reset flag. Debrief Eval
                     }
                     else
                     {
@@ -900,29 +902,30 @@ public override void NotifyEvent(ActivityEventType EventType)
                         if (BoardingS > 0 || ((double)(SchDepart - SchArrive).TotalSeconds > 0 &&
                             MyPlayerTrain.PassengerCarsNumber == 1 && MyPlayerTrain.Cars.Count > 10 ))
                         {
-                        // accepted station stop because either freight train or passenger train or fake passenger train with passenger car on platform or fake passenger train
+                            // accepted station stop because either freight train or passenger train or fake passenger train with passenger car on platform or fake passenger train
                             // with Scheduled Depart > Scheduled Arrive
-                                // ActArrive is usually same as ClockTime
-                                BoardingEndS = Simulator.ClockTime + BoardingS;
+                            // ActArrive is usually same as ClockTime
+                            BoardingEndS = Simulator.ClockTime + BoardingS;
 
-                                if (ActArrive == null)
-                                {
-                                    ActArrive = new DateTime().Add(TimeSpan.FromSeconds(Simulator.ClockTime));
-                                }
+                            if (ActArrive == null)
+                            {
+                                ActArrive = new DateTime().Add(TimeSpan.FromSeconds(Simulator.ClockTime));
+                            }
 
-                                arrived = true;
-                                // But not if game starts after scheduled arrival. In which case actual arrival is assumed to be same as schedule arrival.
-                                double sinceActArriveS = (new DateTime().Add(TimeSpan.FromSeconds(Simulator.ClockTime))
-                                                        - ActArrive).Value.TotalSeconds;
-                                BoardingEndS -= sinceActArriveS;
-                                double SchDepartS = SchDepart.Subtract(new DateTime()).TotalSeconds;
-                                BoardingEndS = CompareTimes.LatestTime((int)SchDepartS, (int)BoardingEndS);
+                            arrived = true;
+                            // But not if game starts after scheduled arrival. In which case actual arrival is assumed to be same as schedule arrival.
+                            double sinceActArriveS = (new DateTime().Add(TimeSpan.FromSeconds(Simulator.ClockTime))
+                                                    - ActArrive).Value.TotalSeconds;
+                            BoardingEndS -= sinceActArriveS;
+                            double SchDepartS = SchDepart.Subtract(new DateTime()).TotalSeconds;
+                            BoardingEndS = CompareTimes.LatestTime((int)SchDepartS, (int)BoardingEndS);
 
-                            }
                         }
+
+                        ldbfevaldepartbeforeboarding = false; // reset flag. Debrief Eval
+                    }
                     if  (MyPlayerTrain.NextSignalObject[0] != null)
                            distanceToNextSignal =  MyPlayerTrain.NextSignalObject[0].DistanceTo(MyPlayerTrain.FrontTDBTraveller);
-
                 }
             }
             else if (EventType == ActivityEventType.TrainStart)
@@ -937,6 +940,15 @@ public override void NotifyEvent(ActivityEventType EventType)
                     if (MyPlayerTrain.TrainType != Train.TRAINTYPE.AI_PLAYERHOSTING)
                        MyPlayerTrain.ClearStation(PlatformEnd1.LinkedPlatformItemId, PlatformEnd2.LinkedPlatformItemId, true);
 
+                    // Debrief Eval: departure before boarding completed
+                    if (!maydepart && !ldbfevaldepartbeforeboarding)
+                    {
+                        var train = Simulator.PlayerLocomotive.Train;
+                        ldbfevaldepartbeforeboarding = true;
+                        DbfEvalDepartBeforeBoarding.Add(PlatformEnd1.Station);
+                        train.DbfEvalValueChanged = true;
+                    }
+
                     if (LogStationStops)
                     {
                         StringBuilder stringBuild = new StringBuilder();
@@ -981,15 +993,6 @@ public override void NotifyEvent(ActivityEventType EventType)
                     {
                         DisplayMessage = Simulator.Catalog.GetStringFmt("Passenger boarding completes in {0:D2}:{1:D2}",
                             remaining / 60, remaining % 60);
-
-                        //Debrief Eval
-                        if (Simulator.PlayerLocomotive.SpeedMpS > 0 && !ldbfevaldepartbeforeboarding)
-                        {
-                            var train = Simulator.PlayerLocomotive.Train;
-                            ldbfevaldepartbeforeboarding = true;
-                            DbfEvalDepartBeforeBoarding.Add(PlatformEnd1.Station);
-                            train.DbfEvalValueChanged = true;
-                        }
                     }
                     // May depart
                     else if (!maydepart)
@@ -1008,8 +1011,6 @@ public override void NotifyEvent(ActivityEventType EventType)
                             if (MyPlayerTrain.IsActualPlayerTrain) Simulator.SoundNotify = Event.PermissionToDepart;
                         }
 
-                        ldbfevaldepartbeforeboarding = false;//reset flag. Debrief Eval
-
                         // if last task, show closure window
                         // also set times in logfile
 
diff --git a/Source/RunActivity/Prerequisites.txt b/Source/RunActivity/Prerequisites.txt
@@ -1,7 +1,6 @@
-﻿Open Rails software Prerequisites.txt - Release v1.5
-September 2022
+﻿Open Rails software Prerequisites.txt - Release v1.6 June 2025
 
-Visit our web-page at http://openrails.org for details and links.
+Visit our web-page at https://openrails.org for details and links.
 
 Please note the distribution and use of Open Rails software is governed by the GNU License - see file Copying.txt. 
 Source code can be downloaded from https://github.com/openrails/openrails
diff --git a/Source/RunActivity/Readme.txt b/Source/RunActivity/Readme.txt
@@ -1,29 +1,23 @@
-﻿Open Rails software Readme.txt - Release v1.5
-September 2022
+﻿Open Rails software Readme.txt - Release v1.6 - June 2025
 
-Visit our web-page at http://openrails.org for details and links.
+Visit our web-page at https://openrails.org for details and links.
 
-Please note the distribution and use of Open Rails software is governed by the GNU License - see file Copying.txt. 
-Source code can be downloaded from https://github.com/openrails/openrails
+Please note the distribution and use of Open Rails software is governed by the GNU License - see file Copying.txt. Source code can be downloaded from https://github.com/openrails/openrails
 
 OPERATION
-- You can run Open Rails by clicking on the Desktop icon or the Quick Launch icon or the Start Menu entry or C:\Program Files (x86)\Open Rails\OpenRails.exe
+- You can run Open Rails by clicking on the Desktop icon or the Quick Launch icon or the Start Menu entry or C:\Program Files\Open Rails\OpenRails.exe
 - Help and Game Controls are available in-game using the Help key (F1).
 - Please read the operations manual in Open Rails > Documents > Manual.pdf
 
 CONTENT
 This Open Rails download does not include any content - no routes, trains, activities - just the simulation program. 
 
-If you have content suitable for Open Rails or Microsoft Train Simulator already in place, then you can use the
-Open Rails program to operate those routes and drive those trains straight away.
+If you have content suitable for Open Rails or Microsoft Train Simulator already in place, then you can use the Open Rails program to operate those routes and drive those trains straight away. If not, then you will need to install some models bought from a vendor or free from the community before you can use Open Rails.
 
-If not, then you will need to install some models bought from a vendor or free from the community before you can use Open Rails.
-
-Or you can try out the 2 self-installing models on our home page - both free of charge.
+Use the Content button for some auto-install routes or visit the catalogue at www.openrails.org/download/explore-content
 
 SUPPORT
 Please send bug reports and feature requests to our Bug Tracker at https://launchpad.net/or
 
 UPDATES
-Open Rails checks once a day for new versions and, if found, adds an Update link in the top right of its main menu. 
-Click this Update link to download and update your Open Rails.
+Open Rails checks once a day for new versions and, if found, adds a red marker to the notification icon in the top right of the menu form. Click on the notification to find the details of an update and install it.
diff --git a/Source/RunActivity/Viewer3D/Lights.cs b/Source/RunActivity/Viewer3D/Lights.cs
@@ -300,7 +300,7 @@ bool UpdateState()
 			Debug.Assert(Viewer.PlayerTrain.LeadLocomotive == Viewer.PlayerLocomotive ||Viewer.PlayerTrain.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING || Viewer.PlayerTrain.Autopilot ||
                 Viewer.PlayerTrain.TrainType == Train.TRAINTYPE.REMOTE || Viewer.PlayerTrain.TrainType == Train.TRAINTYPE.STATIC, "PlayerTrain.LeadLocomotive must be PlayerLocomotive.");
 			var leadLocomotiveCar = Car.Train?.LeadLocomotive; // Note: Will return null for AI trains, this is intended behavior
-			var leadLocomotive = leadLocomotiveCar as MSTSLocomotive;
+            var leadLocomotive = leadLocomotiveCar as MSTSLocomotive;
 
             // There are a lot of conditions now! IgnoredConditions[] stores which conditions are ignored, allowing shortcutting of many of these calculations
             // Should prevent some unneeded computation, but is a little messy. May revise in the future
@@ -318,7 +318,7 @@ bool UpdateState()
                 && leadLocomotive != null && leadLocomotive.TrainBrakeController.EmergencyBraking;
             // Control
             bool newCarIsPlayer = !Car.Lights.IgnoredConditions[3] && Car.Train != null && (Car.Train == Viewer.PlayerTrain || Car.Train.TrainType == Train.TRAINTYPE.REMOTE);
-            // Service - if a player or AI train, then will considered to be in servie, loose consists will not be considered to be in service.
+            // Service - if a player or AI train, then will considered to be in service, loose consists will not be considered to be in service.
             bool newCarInService = !Car.Lights.IgnoredConditions[4] && Car.Train != null
                 && (Car.Train == Viewer.PlayerTrain || Car.Train.TrainType == Train.TRAINTYPE.REMOTE || Car.Train.TrainType == Train.TRAINTYPE.AI);
             // Time of day
@@ -346,6 +346,15 @@ bool UpdateState()
             // Passenger doors
             bool newLeftDoorOpen = !Car.Lights.IgnoredConditions[11] && Car.Train?.DoorState(DoorSide.Left) != DoorState.Closed;
             bool newRightDoorOpen = !Car.Lights.IgnoredConditions[11] && Car.Train?.DoorState(DoorSide.Right) != DoorState.Closed;
+            // AI trains don't have a lead locomotive, but the upcoming lighting calculations want a lead locomotive, try to determine a lead locomotive to use
+            if (leadLocomotive == null && Car.Train != null)
+            {
+                // If first car is flipped, the 'lead' vehicle is actually at the rear
+                if (Car.Train.FirstCar.Flipped && Car.Train.LastCar is MSTSLocomotive)
+                    leadLocomotive = Car.Train.LastCar as MSTSLocomotive;
+                else if (Car.Train.FirstCar is MSTSLocomotive)
+                    leadLocomotive = Car.Train.FirstCar as MSTSLocomotive;
+            }
             // Horn and bell (for flashing ditch lights)
             bool newHornOn = !Car.Lights.IgnoredConditions[12] && leadLocomotive != null && leadLocomotive.HornRecent;
             bool newBellOn = !Car.Lights.IgnoredConditions[13] && leadLocomotive != null && leadLocomotive.BellRecent;
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs
diff --git a/Source/RunActivity/Viewer3D/WebServices/TrainDrivingDisplay.cs b/Source/RunActivity/Viewer3D/WebServices/TrainDrivingDisplay.cs

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#define MyAppVersion "none"`
	`1`	`+#define MyAppVersion "1.6"`