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

Fix signal side when using both sides signal style with no-entry signals

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-05-21 20:42:49 +01:00
parent a24d72f0d7
commit a8d830aa3e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rail_cmd.cpp
View File

@@ -3215,10 +3215,6 @@ void DrawRestrictedSignal(SignalType type, SpriteID sprite, int x, int y, int z,
void DrawSingleSignal(TileIndex tile, const RailTypeInfo *rti, Track track, SignalState condition, SignalOffsets image, uint pos, SignalType type, void DrawSingleSignal(TileIndex tile, const RailTypeInfo *rti, Track track, SignalState condition, SignalOffsets image, uint pos, SignalType type,
SignalVariant variant, const TraceRestrictProgram *prog, CustomSignalSpriteContext context) SignalVariant variant, const TraceRestrictProgram *prog, CustomSignalSpriteContext context)
{ {
bool show_restricted = (prog != nullptr);
if (type == SIGTYPE_NO_ENTRY) pos ^= 1;
uint8_t style = 0; uint8_t style = 0;
if (_num_new_signal_styles > 0) { if (_num_new_signal_styles > 0) {
switch (context.ctx_mode) { switch (context.ctx_mode) {
@@ -3241,6 +3237,10 @@ void DrawSingleSignal(TileIndex tile, const RailTypeInfo *rti, Track track, Sign
DrawSingleSignal(tile, rti, track, condition, image, pos, type, variant, prog, { context.ctx_mode, context.ctx_flags | CSSCF_SECOND_SIGNAL }); DrawSingleSignal(tile, rti, track, condition, image, pos, type, variant, prog, { context.ctx_mode, context.ctx_flags | CSSCF_SECOND_SIGNAL });
} }
bool show_restricted = (prog != nullptr);
if (type == SIGTYPE_NO_ENTRY) pos ^= 1;
uint x, y; uint x, y;
GetSignalXY(tile, pos, HasBit(_signal_style_masks.signal_opposite_side, style) != ((context.ctx_flags & CSSCF_SECOND_SIGNAL) != 0), x, y); GetSignalXY(tile, pos, HasBit(_signal_style_masks.signal_opposite_side, style) != ((context.ctx_flags & CSSCF_SECOND_SIGNAL) != 0), x, y);