cpp/openttd-patchpack/source Changeset - r3270:feab332758a4

Changeset - r3270:feab332758a4

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

tron - 19 years ago 2006-03-19 14:43:23
tron@openttd.org

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

2 files changed with 13 insertions and 13 deletions:

rail_cmd.c

table/track_land.h

0 comments (0 inline, 0 general)

rail_cmd.c

➞

Show inline comments

@@ @@ -1988,13 +1988,13 @@ static uint32 GetTileTrackStatus_Track(T @@
 			if ((b & 0x20) == 0) ret |= 0x20080000;
 			if ((b & 0x10) == 0) ret |= 0x08200000;
+		}
 		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;
+		}
+	}
+}

table/track_land.h

➞

Show inline comments

@@ @@ -10,46 +10,46 @@ typedef struct DrawTrackSeqStruct { @@
 #define TILE_SEQ_BEGIN(x) { x, 0, 0, 0, 0 },
 #define TILE_SEQ_LINE(a, b, c, d, e) { a, b, c, d, e },
 #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()
 };

0 comments (0 inline, 0 general)