diff options
| author | tron <tron@openttd.org> | 2006-03-19 14:43:23 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-03-19 14:43:23 +0000 |
| commit | 85da30604991a2b024aeea64443e61cf979c2424 (patch) | |
| tree | 53c4a4a19a8ac153e943a787777a85bda0b4986b | |
| parent | 4b74fa19230897c9e9b20e6bcba2b16c748cb09f (diff) | |
| download | openttd-85da30604991a2b024aeea64443e61cf979c2424.tar.xz | |
(svn r3982) Fix last commit. I got confused by some strange test, which did nothing
| -rw-r--r-- | rail_cmd.c | 2 | ||||
| -rw-r--r-- | table/track_land.h | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/rail_cmd.c b/rail_cmd.c index 67dc936bc..5943092ad 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -1991,7 +1991,7 @@ static uint32 GetTileTrackStatus_Track(TileIndex tile, TransportType mode) return ret; } else { if (GetRailTileSubtype(tile) == RAIL_SUBTYPE_DEPOT) { - return 0; + return (DiagDirToAxis(GetRailDepotDirection(tile)) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y) * 0x101; } else { return GetRailWaypointBits(tile) * 0x101; } diff --git a/table/track_land.h b/table/track_land.h index 3ca8ca14b..6d8d90d21 100644 --- a/table/track_land.h +++ b/table/track_land.h @@ -13,40 +13,40 @@ typedef struct DrawTrackSeqStruct { #define TILE_SEQ_END() { 0, 0, 0, 0, 0 } static const DrawTrackSeqStruct _track_depot_layout_table_0[] = { - TILE_SEQ_BEGIN(0xF8D) - TILE_SEQ_LINE(0x42B | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1) + TILE_SEQ_BEGIN(SPR_FLAT_GRASS_TILE) + TILE_SEQ_LINE(SPR_RAIL_DEPOT_NE | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1) TILE_SEQ_END() }; static const DrawTrackSeqStruct _track_depot_layout_table_1[] = { - TILE_SEQ_BEGIN(0x3F3 | PALETTE_MODIFIER_COLOR) - TILE_SEQ_LINE(0x427 | PALETTE_MODIFIER_COLOR, 2, 2, 1, 13) - TILE_SEQ_LINE(0x428 | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13) + TILE_SEQ_BEGIN(SPR_RAIL_TRACK_Y | PALETTE_MODIFIER_COLOR) + TILE_SEQ_LINE(SPR_RAIL_DEPOT_SE_1 | PALETTE_MODIFIER_COLOR, 2, 2, 1, 13) + TILE_SEQ_LINE(SPR_RAIL_DEPOT_SE_2 | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13) TILE_SEQ_END() }; static const DrawTrackSeqStruct _track_depot_layout_table_2[] = { - TILE_SEQ_BEGIN(0x3F4 | PALETTE_MODIFIER_COLOR) - TILE_SEQ_LINE(0x429 | PALETTE_MODIFIER_COLOR, 2, 2, 13, 1) - TILE_SEQ_LINE(0x42A | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1) + TILE_SEQ_BEGIN(SPR_RAIL_TRACK_X | PALETTE_MODIFIER_COLOR) + TILE_SEQ_LINE(SPR_RAIL_DEPOT_SW_1 | PALETTE_MODIFIER_COLOR, 2, 2, 13, 1) + TILE_SEQ_LINE(SPR_RAIL_DEPOT_SW_2 | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1) TILE_SEQ_END() }; static const DrawTrackSeqStruct _track_depot_layout_table_3[] = { - TILE_SEQ_BEGIN(0xF8D) - TILE_SEQ_LINE(0x42C | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13) + TILE_SEQ_BEGIN(SPR_FLAT_GRASS_TILE) + TILE_SEQ_LINE(SPR_RAIL_DEPOT_NW | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13) TILE_SEQ_END() }; static const DrawTrackSeqStruct _track_waypoint_table_0[] = { - TILE_SEQ_BEGIN(0x3F4 | PALETTE_MODIFIER_COLOR) + TILE_SEQ_BEGIN(SPR_RAIL_TRACK_X | PALETTE_MODIFIER_COLOR) TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_X_1, 0, 0, 16, 5) TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_X_2, 0, 11, 16, 5) TILE_SEQ_END() }; static const DrawTrackSeqStruct _track_waypoint_table_1[] = { - TILE_SEQ_BEGIN(0x3F3 | PALETTE_MODIFIER_COLOR) + TILE_SEQ_BEGIN(SPR_RAIL_TRACK_Y | PALETTE_MODIFIER_COLOR) TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_Y_1, 0, 0, 5, 16) TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_Y_2, 11, 0, 5, 16) TILE_SEQ_END() |