Skip to content

Commit

Permalink
Automatic merge of T1.5-101-g1ceb042d8 and 14 pull requests
Browse files Browse the repository at this point in the history
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #706 at 570ab21: Extended door functionality
- Pull request #713 at 5a8da77: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 9cffa6d: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #740 at b3e66ca: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts)
- Pull request #741 at 2dd56ad: Fixed brake controller script not being loaded in timetable mode
- Pull request #743 at bdc6668: Default filename for include statements 
- Pull request #744 at 3c2dc07: Fixed and improved cabview control conditions related to power supply state
- Pull request #745 at cf5acd2: Fix digital displays in rear 3D cab
  • Loading branch information
openrails-bot committed Nov 12, 2022
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Source/Documentation/Manual/physics.rst
Expand Up @@ -4221,7 +4221,7 @@ statement. So, in the case of the example above, instead of::

the following can be written::

include ( ../##SameName## )
include ( ../>>SameName<< )
This way all additional .wag or .eng files referring to similar trainsets would
have exactly the same contents, drastically reducing editing time.
Expand Down
2 changes: 1 addition & 1 deletion Source/Orts.Parsers.Msts/STFReader.cs
Expand Up @@ -1828,7 +1828,7 @@ private string ReadItem(bool skip_mode, bool string_mode)
SkipRestOfBlock();
}
var purefilename = Path.GetFileName(filename).ToLower();
if (purefilename == "##samename##")
if (purefilename == ">>samename<<")
filename = Path.GetDirectoryName(filename) + @"\" + Path.GetFileName(FileName);
var includeFileName = Path.GetDirectoryName(FileName) + @"\" + filename;
if (!File.Exists(includeFileName))
Expand Down

0 comments on commit 30dc4a9

Please sign in to comment.