Skip to content

Commit 6e049f4

Browse files
committed
Automatic merge of T1.6-59-g2eb7441b0 and 12 pull requests
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window - Pull request #1086 at d8d61eb: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at e813c42: Automatic speed control - Pull request #1104 at 7919243: 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 #1124 at e241a0d: Built-in PBL2 brake controller - Pull request #1157 at 39cd994: Dynamic brake authorization by TCS - Pull request #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
14 parents ee117d3 + 2eb7441 + f46d5f2 + d8d61eb + e813c42 + 7919243 + 270f22f + ba3c47f + 91d2d26 + e241a0d + 39cd994 + 48c9a63 + 5845a1a + 1d7643d commit 6e049f4

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Source/Orts.Formats.Msts/WorldFile.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public class Tr_Worldfile : List<WorldObject>
8282
{
8383
TokenID.VDbIdCount,
8484
TokenID.ViewDbSphere,
85+
TokenID.Ruler,
8586
};
8687

8788
public Tr_Worldfile(SBR block, string filename, List<TokenID> allowedTokens)

Source/Orts.Parsers.Msts/TokenID.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,6 +1718,9 @@ public enum TokenID : uint
17181718
MaxStackedContainers,
17191719
Length,
17201720
Flipped,
1721+
1722+
// TSRE specific
1723+
Ruler
17211724
}
17221725

17231726
}

0 commit comments

Comments
 (0)