dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ScriptRail::BuildSignal when using realistic braking with block signals

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-04-15 00:16:41 +01:00
parent 46d71463d9
commit 0dcbcedbac
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/script/api/script_rail.cpp
View File

@@ -448,6 +448,7 @@ static bool IsValidSignalType(int signal_type)
EnforcePrecondition(false, ScriptMap::DistanceManhattan(tile, front) == 1) EnforcePrecondition(false, ScriptMap::DistanceManhattan(tile, front) == 1)
EnforcePrecondition(false, ::IsPlainRailTile(tile)); EnforcePrecondition(false, ::IsPlainRailTile(tile));
EnforcePrecondition(false, ::IsValidSignalType(signal)); EnforcePrecondition(false, ::IsValidSignalType(signal));
EnforcePrecondition(false, signal < SIGNALTYPE_TWOWAY || _settings_game.vehicle.train_braking_model == TBM_ORIGINAL);
Track track = INVALID_TRACK; Track track = INVALID_TRACK;
uint signal_cycles = 0; uint signal_cycles = 0;
@@ -464,7 +465,7 @@ static bool IsValidSignalType(int signal_type)
uint p1 = track; uint p1 = track;
if (signal < SIGNALTYPE_TWOWAY) { if (signal < SIGNALTYPE_TWOWAY) {
if (signal != SIGNALTYPE_PBS && signal != SIGNALTYPE_PBS_ONEWAY) signal_cycles++; if (signal != SIGNALTYPE_PBS && signal != SIGNALTYPE_PBS_ONEWAY && _settings_game.vehicle.train_braking_model == TBM_ORIGINAL) signal_cycles++;
p1 |= (signal_cycles << 15); p1 |= (signal_cycles << 15);
} }
p1 |= ((signal >= SIGNALTYPE_TWOWAY ? signal ^ SIGNALTYPE_TWOWAY : signal) << 5); p1 |= ((signal >= SIGNALTYPE_TWOWAY ? signal ^ SIGNALTYPE_TWOWAY : signal) << 5);