Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3982) Fix last commit. I got confused by some strange test, which did nothing

Browse Source
This commit is contained in:
tron 2006-03-19 14:43:23 +00:00
parent 4b74fa1923
commit 85da306049
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rail_cmd.c
View File

@ -1991,7 +1991,7 @@ static uint32 GetTileTrackStatus_Track(TileIndex tile, TransportType mode)
return ret; return ret;
} else { } else {
if (GetRailTileSubtype(tile) == RAIL_SUBTYPE_DEPOT) { if (GetRailTileSubtype(tile) == RAIL_SUBTYPE_DEPOT) {
return 0; return (DiagDirToAxis(GetRailDepotDirection(tile)) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y) * 0x101;
} else { } else {
return GetRailWaypointBits(tile) * 0x101; return GetRailWaypointBits(tile) * 0x101;
} }

24
table/track_land.h
View File

@ -13,40 +13,40 @@ typedef struct DrawTrackSeqStruct {
#define TILE_SEQ_END() { 0, 0, 0, 0, 0 } #define TILE_SEQ_END() { 0, 0, 0, 0, 0 }
static const DrawTrackSeqStruct _track_depot_layout_table_0[] = { static const DrawTrackSeqStruct _track_depot_layout_table_0[] = {
TILE_SEQ_BEGIN(0xF8D) TILE_SEQ_BEGIN(SPR_FLAT_GRASS_TILE)
TILE_SEQ_LINE(0x42B | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1) TILE_SEQ_LINE(SPR_RAIL_DEPOT_NE | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1)
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTrackSeqStruct _track_depot_layout_table_1[] = { static const DrawTrackSeqStruct _track_depot_layout_table_1[] = {
TILE_SEQ_BEGIN(0x3F3 | PALETTE_MODIFIER_COLOR) TILE_SEQ_BEGIN(SPR_RAIL_TRACK_Y | PALETTE_MODIFIER_COLOR)
TILE_SEQ_LINE(0x427 | PALETTE_MODIFIER_COLOR, 2, 2, 1, 13) TILE_SEQ_LINE(SPR_RAIL_DEPOT_SE_1 | PALETTE_MODIFIER_COLOR, 2, 2, 1, 13)
TILE_SEQ_LINE(0x428 | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13) TILE_SEQ_LINE(SPR_RAIL_DEPOT_SE_2 | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13)
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTrackSeqStruct _track_depot_layout_table_2[] = { static const DrawTrackSeqStruct _track_depot_layout_table_2[] = {
TILE_SEQ_BEGIN(0x3F4 | PALETTE_MODIFIER_COLOR) TILE_SEQ_BEGIN(SPR_RAIL_TRACK_X | PALETTE_MODIFIER_COLOR)
TILE_SEQ_LINE(0x429 | PALETTE_MODIFIER_COLOR, 2, 2, 13, 1) TILE_SEQ_LINE(SPR_RAIL_DEPOT_SW_1 | PALETTE_MODIFIER_COLOR, 2, 2, 13, 1)
TILE_SEQ_LINE(0x42A | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1) TILE_SEQ_LINE(SPR_RAIL_DEPOT_SW_2 | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1)
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTrackSeqStruct _track_depot_layout_table_3[] = { static const DrawTrackSeqStruct _track_depot_layout_table_3[] = {
TILE_SEQ_BEGIN(0xF8D) TILE_SEQ_BEGIN(SPR_FLAT_GRASS_TILE)
TILE_SEQ_LINE(0x42C | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13) TILE_SEQ_LINE(SPR_RAIL_DEPOT_NW | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13)
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTrackSeqStruct _track_waypoint_table_0[] = { 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_1, 0, 0, 16, 5)
TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_X_2, 0, 11, 16, 5) TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_X_2, 0, 11, 16, 5)
TILE_SEQ_END() TILE_SEQ_END()
}; };
static const DrawTrackSeqStruct _track_waypoint_table_1[] = { 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_1, 0, 0, 5, 16)
TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_Y_2, 11, 0, 5, 16) TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_Y_2, 11, 0, 5, 16)
TILE_SEQ_END() TILE_SEQ_END()