diff options
| author | tron <tron@openttd.org> | 2005-02-22 18:27:57 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-02-22 18:27:57 +0000 |
| commit | 20b8c4844068a11ef50f094a76c93072e5f66144 (patch) | |
| tree | 172f26d9186119906c5fe0ac9636448ff28eddba /table/track_land.h | |
| parent | c2a6d182d778c37dffc5dffd4f1c1541e94d9477 (diff) | |
| download | openttd-20b8c4844068a11ef50f094a76c93072e5f66144.tar.xz | |
(svn r1903) Replace some casts and macro magic with proper typing, similar to r1902
Diffstat (limited to 'table/track_land.h')
| -rw-r--r-- | table/track_land.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/table/track_land.h b/table/track_land.h index 440048058..41df8b21d 100644 --- a/table/track_land.h +++ b/table/track_land.h @@ -1,41 +1,41 @@ -#define TILE_SEQ_BEGIN(x) ADD_WORD(x), -#define TILE_SEQ_LINE(a,b,c,d,e) ADD_WORD(a), b,c,d,e, -#define TILE_SEQ_END() 0,0,0,0 +#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 byte _track_depot_layout_table_0[] = { +static const DrawTrackSeqStruct _track_depot_layout_table_0[] = { TILE_SEQ_BEGIN(0xF8D) TILE_SEQ_LINE(0x842B, 2, 13, 13, 1) TILE_SEQ_END() }; -static const byte _track_depot_layout_table_1[] = { +static const DrawTrackSeqStruct _track_depot_layout_table_1[] = { TILE_SEQ_BEGIN(0x83F3) TILE_SEQ_LINE(0x8427, 2, 2, 1, 13) TILE_SEQ_LINE(0x8428, 13, 2, 1, 13) TILE_SEQ_END() }; -static const byte _track_depot_layout_table_2[] = { +static const DrawTrackSeqStruct _track_depot_layout_table_2[] = { TILE_SEQ_BEGIN(0x83F4) TILE_SEQ_LINE(0x8429, 2, 2, 13, 1) TILE_SEQ_LINE(0x842A, 2, 13, 13, 1) TILE_SEQ_END() }; -static const byte _track_depot_layout_table_3[] = { +static const DrawTrackSeqStruct _track_depot_layout_table_3[] = { TILE_SEQ_BEGIN(0xF8D) TILE_SEQ_LINE(0x842C, 13, 2, 1, 13) TILE_SEQ_END() }; -static const byte _track_waypoint_table_0[] = { +static const DrawTrackSeqStruct _track_waypoint_table_0[] = { TILE_SEQ_BEGIN(0x83F4) TILE_SEQ_LINE(0x8000 + SPR_OPENTTD_BASE+18, 0, 0, 16, 5) TILE_SEQ_LINE(0x8000 + SPR_OPENTTD_BASE+19, 0, 11, 16, 5) TILE_SEQ_END() }; -static const byte _track_waypoint_table_1[] = { +static const DrawTrackSeqStruct _track_waypoint_table_1[] = { TILE_SEQ_BEGIN(0x83F3) TILE_SEQ_LINE(0x8000 + SPR_OPENTTD_BASE+20, 0, 0, 5, 16) TILE_SEQ_LINE(0x8000 + SPR_OPENTTD_BASE+21, 11, 0, 5, 16) @@ -43,7 +43,7 @@ static const byte _track_waypoint_table_1[] = { }; -static const byte * const _track_depot_layout_table[6] = { +static const DrawTrackSeqStruct* const _track_depot_layout_table[] = { _track_depot_layout_table_0, _track_depot_layout_table_1, _track_depot_layout_table_2, |