diff options
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/bridge_land.h | 6 | ||||
| -rw-r--r-- | src/table/files.h | 4 | ||||
| -rw-r--r-- | src/table/sprites.h | 13 |
3 files changed, 20 insertions, 3 deletions
diff --git a/src/table/bridge_land.h b/src/table/bridge_land.h index 84b5794fd..f90b21d97 100644 --- a/src/table/bridge_land.h +++ b/src/table/bridge_land.h @@ -28,6 +28,12 @@ # define MW(a) {a, PALETTE_TO_STRUCT_WHITE} # define MC(a) {a, PALETTE_TO_STRUCT_CONCRETE} +static const PalSpriteID _aqueduct_sprites[] = { + { SPR_AQUEDUCT_MIDDLE_X, PAL_NONE }, { 0x0, PAL_NONE }, { SPR_AQUEDUCT_PILLAR_X, PAL_NONE }, { 0x0, PAL_NONE }, + { SPR_AQUEDUCT_MIDDLE_Y, PAL_NONE }, { 0x0, PAL_NONE }, { SPR_AQUEDUCT_PILLAR_Y, PAL_NONE }, { 0x0, PAL_NONE }, + { SPR_AQUEDUCT_RAMP_SW, PAL_NONE }, { SPR_AQUEDUCT_RAMP_SE, PAL_NONE }, { SPR_AQUEDUCT_RAMP_NE, PAL_NONE }, { SPR_AQUEDUCT_RAMP_NW, PAL_NONE }, +}; + static const PalSpriteID _bridge_sprite_table_4_0[] = { { 0x9A9, PAL_NONE }, { 0x99F, PAL_NONE }, { 0x9B1, PAL_NONE }, { 0x0, PAL_NONE }, { 0x9A5, PAL_NONE }, { 0x997, PAL_NONE }, { 0x9AD, PAL_NONE }, { 0x0, PAL_NONE }, diff --git a/src/table/files.h b/src/table/files.h index b4ef2e4b9..1174d7483 100644 --- a/src/table/files.h +++ b/src/table/files.h @@ -35,7 +35,7 @@ static FileList files_dos = { { "TRGT.GRF", {0xfc, 0xde, 0x1d, 0x7e, 0x8a, 0x74, 0x19, 0x7d, 0x72, 0xa6, 0x26, 0x95, 0x88, 0x4b, 0x90, 0x9e} } }, { "SAMPLE.CAT", {0x42, 0x2e, 0xa3, 0xdd, 0x07, 0x4d, 0x28, 0x59, 0xbb, 0x51, 0x63, 0x9a, 0x6e, 0x0e, 0x85, 0xda} }, - { "OPENTTDD.GRF", {0xb6, 0xed, 0x9a, 0x20, 0x89, 0xad, 0x6e, 0xa1, 0x55, 0x10, 0xad, 0x00, 0x53, 0xa3, 0xd5, 0xbc} } + { "OPENTTDD.GRF", {0x43, 0x3d, 0x38, 0xa9, 0x7a, 0xd7, 0x5a, 0xc2, 0x52, 0xf6, 0x52, 0x49, 0x38, 0x15, 0x0a, 0x71} } }; @@ -49,5 +49,5 @@ static FileList files_win = { { "TRGTR.GRF", {0xde, 0x53, 0x65, 0x05, 0x17, 0xfe, 0x66, 0x1c, 0xea, 0xa3, 0x13, 0x8c, 0x6e, 0xdb, 0x0e, 0xb8} } }, { "SAMPLE.CAT", {0x92, 0x12, 0xe8, 0x1e, 0x72, 0xba, 0xdd, 0x4b, 0xbe, 0x1e, 0xae, 0xae, 0x66, 0x45, 0x8e, 0x10} }, - { "OPENTTDW.GRF", {0x41, 0x1e, 0xb6, 0xb2, 0xd2, 0xc4, 0x30, 0x6e, 0x7b, 0xc7, 0xdc, 0x39, 0xd4, 0x40, 0x46, 0xfb} } + { "OPENTTDW.GRF", {0x40, 0xb4, 0x75, 0xe2, 0xd9, 0x55, 0x6e, 0x30, 0x5f, 0x3f, 0x8d, 0xb3, 0xbe, 0x10, 0x36, 0x17} } }; diff --git a/src/table/sprites.h b/src/table/sprites.h index c357ba7ee..c427be684 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -132,7 +132,18 @@ enum Sprites { SPR_CANALS_BASE = SPR_SIGNALS_BASE + PRESIGNAL_SEMAPHORE_AND_PBS_SPRITE_COUNT, CANALS_SPRITE_COUNT = 65, - SPR_SLOPES_BASE = SPR_CANALS_BASE + CANALS_SPRITE_COUNT, + SPR_AQUEDUCT_BASE = SPR_CANALS_BASE + CANALS_SPRITE_COUNT, + SPR_AQUEDUCT_RAMP_SW = SPR_AQUEDUCT_BASE + 0, + SPR_AQUEDUCT_RAMP_SE = SPR_AQUEDUCT_BASE + 1, + SPR_AQUEDUCT_RAMP_NE = SPR_AQUEDUCT_BASE + 2, + SPR_AQUEDUCT_RAMP_NW = SPR_AQUEDUCT_BASE + 3, + SPR_AQUEDUCT_MIDDLE_X = SPR_AQUEDUCT_BASE + 4, + SPR_AQUEDUCT_MIDDLE_Y = SPR_AQUEDUCT_BASE + 5, + SPR_AQUEDUCT_PILLAR_X = SPR_AQUEDUCT_BASE + 6, + SPR_AQUEDUCT_PILLAR_Y = SPR_AQUEDUCT_BASE + 7, + AQUEDUCT_SPRITE_COUNT = 8, + + SPR_SLOPES_BASE = SPR_AQUEDUCT_BASE + AQUEDUCT_SPRITE_COUNT, SPR_SLOPES_INCLINED_OFFSET = 15, SPR_SLOPES_VIRTUAL_BASE = SPR_SLOPES_BASE - SPR_SLOPES_INCLINED_OFFSET, // The original foundations (see SPR_FOUNDATION_BASE below) are mapped before the additional foundations. SPR_TRKFOUND_BLOCK_SIZE = 22, // The normal track foundation sprites are organized in blocks of 22. |