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

Fix signals on bridge middle parts not using per-railtype custom signals

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-08-20 22:28:08 +01:00
parent 2283ce3a2b
commit a6b0d0cde4
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tunnelbridge_cmd.cpp
View File

@@ -1801,15 +1801,21 @@ static void DrawBridgeSignalOnMiddlePart(const TileInfo *ti, TileIndex bridge_st
z += 5; z += 5;
SignalVariant variant = IsTunnelBridgeSemaphore(bridge_start_tile) ? SIG_SEMAPHORE : SIG_ELECTRIC; SignalVariant variant = IsTunnelBridgeSemaphore(bridge_start_tile) ? SIG_SEMAPHORE : SIG_ELECTRIC;
SignalState state = GetBridgeEntranceSimulatedSignalState(bridge_start_tile, m2_position);
SpriteID sprite = (GetBridgeEntranceSimulatedSignalState(bridge_start_tile, m2_position) == SIGNAL_STATE_GREEN); const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(bridge_start_tile));
SpriteID sprite = GetCustomSignalSprite(rti, bridge_start_tile, SIGTYPE_NORMAL, variant, state);
if (sprite != 0) {
sprite += position;
} else {
if (variant == SIG_ELECTRIC) { if (variant == SIG_ELECTRIC) {
/* Normal electric signals are picked from original sprites. */ /* Normal electric signals are picked from original sprites. */
sprite += SPR_ORIGINAL_SIGNALS_BASE + (position << 1); sprite = SPR_ORIGINAL_SIGNALS_BASE + (position << 1) + (state == SIGNAL_STATE_GREEN ? 1 : 0);
} else { } else {
/* All other signals are picked from add on sprites. */ /* All other signals are picked from add on sprites. */
sprite += SPR_SIGNALS_BASE + (variant * 64) + (position << 1) - 16; sprite = SPR_SIGNALS_BASE + (variant * 64) + (position << 1) - 16 + (state == SIGNAL_STATE_GREEN ? 1 : 0);
}
} }
AddSortableSpriteToDraw(sprite, PAL_NONE, x, y, 1, 1, TILE_HEIGHT, z, false, 0, 0, BB_Z_SEPARATOR); AddSortableSpriteToDraw(sprite, PAL_NONE, x, y, 1, 1, TILE_HEIGHT, z, false, 0, 0, BB_Z_SEPARATOR);