|
|
|
@ -1453,7 +1453,7 @@ static void DrawSingleSignal(TileIndex tile, Track track, byte condition, uint i
|
|
|
|
|
sprite = SPR_ORIGINAL_SIGNALS_BASE + image + condition;
|
|
|
|
|
} else {
|
|
|
|
|
/* All other signals are picked from add on sprites. */
|
|
|
|
|
sprite = SPR_SIGNALS_BASE + (type - 1) * 16 + variant * 64 + image + condition;
|
|
|
|
|
sprite = SPR_SIGNALS_BASE + (type - 1) * 16 + variant * 64 + image + condition + (type > SIGTYPE_LAST_NOPBS ? 64 : 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AddSortableSpriteToDraw(sprite, PAL_NONE, x, y, 1, 1, BB_HEIGHT_UNDER_BRIDGE, GetSaveSlopeZ(x, y, track));
|
|
|
|
@ -2231,30 +2231,54 @@ static void GetTileDesc_Track(TileIndex tile, TileDesc *td)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RAIL_TILE_SIGNALS: {
|
|
|
|
|
const StringID signal_type[4][4] = {
|
|
|
|
|
const StringID signal_type[6][6] = {
|
|
|
|
|
{
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PRESIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_EXITSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_COMBOSIGNALS
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_COMBOSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PBSSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS,
|
|
|
|
|
STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|