diff options
| author | celestar <celestar@openttd.org> | 2005-07-24 15:56:31 +0000 |
|---|---|---|
| committer | celestar <celestar@openttd.org> | 2005-07-24 15:56:31 +0000 |
| commit | 238e47cd42c009f2ab1359428788a65a26fafebb (patch) | |
| tree | e02fce527cef08bc25354c995fecc8ddb0ab5318 /table/track_land.h | |
| parent | a227065ab75d6cb9f449f2282315adc933450b49 (diff) | |
| download | openttd-238e47cd42c009f2ab1359428788a65a26fafebb.tar.xz | |
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
by enums. There remains work in gfx.c to move the "transparency" and
"recolor" bits around to make space for more sprites. However, 2800
additional sprites can now be loaded. There also remains cleanup and
Doxygen work on many of the header files.
Diffstat (limited to 'table/track_land.h')
| -rw-r--r-- | table/track_land.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/table/track_land.h b/table/track_land.h index 6f3d821b9..97573ad4a 100644 --- a/table/track_land.h +++ b/table/track_land.h @@ -1,7 +1,7 @@ /* $Id$ */ typedef struct DrawTrackSeqStruct { - uint16 image; + SpriteID image; byte subcoord_x; byte subcoord_y; byte width; @@ -14,41 +14,41 @@ typedef struct DrawTrackSeqStruct { static const DrawTrackSeqStruct _track_depot_layout_table_0[] = { TILE_SEQ_BEGIN(0xF8D) - TILE_SEQ_LINE(0x842B, 2, 13, 13, 1) + TILE_SEQ_LINE(0x42B | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1) TILE_SEQ_END() }; 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_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_END() }; 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_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_END() }; static const DrawTrackSeqStruct _track_depot_layout_table_3[] = { TILE_SEQ_BEGIN(0xF8D) - TILE_SEQ_LINE(0x842C, 13, 2, 1, 13) + TILE_SEQ_LINE(0x42C | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13) TILE_SEQ_END() }; 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_BEGIN(0x3F4 | PALETTE_MODIFIER_COLOR) + TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | (SPR_OPENTTD_BASE + 18), 0, 0, 16, 5) + TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | (SPR_OPENTTD_BASE + 19), 0, 11, 16, 5) TILE_SEQ_END() }; 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) + TILE_SEQ_BEGIN(0x3F3 | PALETTE_MODIFIER_COLOR) + TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | (SPR_OPENTTD_BASE + 20), 0, 0, 5, 16) + TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | (SPR_OPENTTD_BASE + 21), 11, 0, 5, 16) TILE_SEQ_END() }; |