Skip to content

Commit 33f8112

Browse files
committed
Automatic merge of T1.5.1-1806-g5522fc5fa and 11 pull requests
- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting - Pull request #1062 at bbc0013: Train Forces popup Window. - Pull request #1064 at 1be1fc4: Add Train Info tab to Help window (F1) - Pull request #1067 at 5bf4677: Traction and dynamic brake retardation - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12 - Pull request #1076 at 3bbd537: Allow depart early - Pull request #1085 at 37e2817: updates key commands for Train Operations window and also Daylight Offset - Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
13 parents b8d9b5e + 5522fc5 + 362e4e7 + bbc0013 + 1be1fc4 + 5bf4677 + 1f5ba4c + e9a66c1 + 3bbd537 + 37e2817 + e10390b + 5845a1a + 689494b commit 33f8112

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Parsers.Msts/STFReader.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ public double ReadDouble(double? defaultValue)
647647
/// </summary>
648648
// Additional entries because MSTS has multiple default units, e.g. some speeds in metres/sec and others in miles/hr
649649
[Flags]
650-
public enum UNITS
650+
public enum UNITS : ulong
651651
{
652652
/// <summary>No unit parsing is done on the {constant_item} - which is obviously fastest
653653
/// </summary>
@@ -829,7 +829,7 @@ public enum UNITS
829829
/// <summary>Valid Units: w/s, kw/s, hp/s
830830
/// <para>Scaled to watts per second.</para>
831831
/// </summary>
832-
PowerRate = 1 << 31,
832+
PowerRate = 1ul << 31,
833833

834834
// "Any" is used where units cannot easily be specified, such as generic routines for interpolating continuous data from point values.
835835
// or interpreting locomotive cab attributes from the ORTSExtendedCVF experimental mechanism.

0 commit comments

Comments
 (0)