1451 if (type == SIGTYPE_NORMAL && variant == SIG_ELECTRIC) { |
1451 if (type == SIGTYPE_NORMAL && variant == SIG_ELECTRIC) { |
1452 /* Normal electric signals are picked from original sprites. */ |
1452 /* Normal electric signals are picked from original sprites. */ |
1453 sprite = SPR_ORIGINAL_SIGNALS_BASE + image + condition; |
1453 sprite = SPR_ORIGINAL_SIGNALS_BASE + image + condition; |
1454 } else { |
1454 } else { |
1455 /* All other signals are picked from add on sprites. */ |
1455 /* All other signals are picked from add on sprites. */ |
1456 sprite = SPR_SIGNALS_BASE + (type - 1) * 16 + variant * 64 + image + condition; |
1456 sprite = SPR_SIGNALS_BASE + (type - 1) * 16 + variant * 64 + image + condition + (type > SIGTYPE_LAST_NOPBS ? 64 : 0); |
1457 } |
1457 } |
1458 |
1458 |
1459 AddSortableSpriteToDraw(sprite, PAL_NONE, x, y, 1, 1, BB_HEIGHT_UNDER_BRIDGE, GetSaveSlopeZ(x, y, track)); |
1459 AddSortableSpriteToDraw(sprite, PAL_NONE, x, y, 1, 1, BB_HEIGHT_UNDER_BRIDGE, GetSaveSlopeZ(x, y, track)); |
1460 } |
1460 } |
1461 |
1461 |
2229 case RAIL_TILE_NORMAL: |
2229 case RAIL_TILE_NORMAL: |
2230 td->str = STR_1021_RAILROAD_TRACK; |
2230 td->str = STR_1021_RAILROAD_TRACK; |
2231 break; |
2231 break; |
2232 |
2232 |
2233 case RAIL_TILE_SIGNALS: { |
2233 case RAIL_TILE_SIGNALS: { |
2234 const StringID signal_type[4][4] = { |
2234 const StringID signal_type[6][6] = { |
2235 { |
2235 { |
2236 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS, |
2236 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS, |
2237 STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS, |
2237 STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS, |
2238 STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS, |
2238 STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS, |
2239 STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS |
2239 STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS, |
|
2240 STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS, |
|
2241 STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS |
2240 }, |
2242 }, |
2241 { |
2243 { |
2242 STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS, |
2244 STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS, |
2243 STR_RAILROAD_TRACK_WITH_PRESIGNALS, |
2245 STR_RAILROAD_TRACK_WITH_PRESIGNALS, |
2244 STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS, |
2246 STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS, |
2245 STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS |
2247 STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS, |
|
2248 STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS, |
|
2249 STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS |
2246 }, |
2250 }, |
2247 { |
2251 { |
2248 STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS, |
2252 STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS, |
2249 STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS, |
2253 STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS, |
2250 STR_RAILROAD_TRACK_WITH_EXITSIGNALS, |
2254 STR_RAILROAD_TRACK_WITH_EXITSIGNALS, |
2251 STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS |
2255 STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS, |
|
2256 STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS, |
|
2257 STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS |
2252 }, |
2258 }, |
2253 { |
2259 { |
2254 STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS, |
2260 STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS, |
2255 STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS, |
2261 STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS, |
2256 STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS, |
2262 STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS, |
2257 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS |
2263 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS, |
|
2264 STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS, |
|
2265 STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS |
|
2266 }, |
|
2267 { |
|
2268 STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS, |
|
2269 STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS, |
|
2270 STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS, |
|
2271 STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS, |
|
2272 STR_RAILROAD_TRACK_WITH_PBSSIGNALS, |
|
2273 STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS |
|
2274 }, |
|
2275 { |
|
2276 STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS, |
|
2277 STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS, |
|
2278 STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS, |
|
2279 STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS, |
|
2280 STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS, |
|
2281 STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS |
2258 } |
2282 } |
2259 }; |
2283 }; |
2260 |
2284 |
2261 td->str = signal_type[GetSignalType(tile, TRACK_UPPER)][GetSignalType(tile, TRACK_LOWER)]; |
2285 td->str = signal_type[GetSignalType(tile, TRACK_UPPER)][GetSignalType(tile, TRACK_LOWER)]; |
2262 break; |
2286 break; |