diff options
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/files.h | 4 | ||||
| -rw-r--r-- | src/table/sprites.h | 17 | ||||
| -rw-r--r-- | src/table/station_land.h | 8 |
3 files changed, 11 insertions, 18 deletions
diff --git a/src/table/files.h b/src/table/files.h index 79ee01b0b..615029b6e 100644 --- a/src/table/files.h +++ b/src/table/files.h @@ -34,7 +34,7 @@ static FileList files_dos = { }, { "SAMPLE.CAT", {0x42, 0x2e, 0xa3, 0xdd, 0x07, 0x4d, 0x28, 0x59, 0xbb, 0x51, 0x63, 0x9a, 0x6e, 0x0e, 0x85, 0xda} }, { "CHARS.GRF", {0x5f, 0x2e, 0xbf, 0x05, 0xb6, 0x12, 0x65, 0x81, 0xd2, 0x10, 0xa9, 0x19, 0x62, 0x41, 0x70, 0x64} }, - { "OPENTTDD.GRF", {0x60, 0xfe, 0xc1, 0xc7, 0x66, 0xe7, 0x59, 0xff, 0x1b, 0x6c, 0xc4, 0x5f, 0xe6, 0x6b, 0x8c, 0x91} } + { "OPENTTDD.GRF", {0x9a, 0x26, 0xc9, 0xd1, 0xa2, 0x39, 0xb8, 0xaa, 0x57, 0xac, 0x0f, 0xf0, 0xe4, 0x4b, 0x37, 0xb2} } }; static FileList files_win = { @@ -48,5 +48,5 @@ static FileList files_win = { }, { "SAMPLE.CAT", {0x92, 0x12, 0xe8, 0x1e, 0x72, 0xba, 0xdd, 0x4b, 0xbe, 0x1e, 0xae, 0xae, 0x66, 0x45, 0x8e, 0x10} }, { "CHARS.GRF", {0x5f, 0x2e, 0xbf, 0x05, 0xb6, 0x12, 0x65, 0x81, 0xd2, 0x10, 0xa9, 0x19, 0x62, 0x41, 0x70, 0x64} }, - { "OPENTTDW.GRF", {0x85, 0xb7, 0xd0, 0xa6, 0xc3, 0x86, 0x44, 0x03, 0xa1, 0x25, 0xa5, 0xbb, 0x50, 0x75, 0xa0, 0xa1} } + { "OPENTTDW.GRF", {0xa1, 0x9c, 0xaa, 0xfc, 0x6b, 0xd2, 0x09, 0xc3, 0xd4, 0x84, 0x33, 0x43, 0x3f, 0xd1, 0xbd, 0xd5} } }; diff --git a/src/table/sprites.h b/src/table/sprites.h index 16fc900d7..e906383a8 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -141,7 +141,11 @@ enum Sprites { SPR_2CCMAP_BASE = SPR_ELRAIL_BASE + ELRAIL_SPRITE_COUNT, TWOCCMAP_SPRITE_COUNT = 256, - SPR_AIRPORTX_BASE = SPR_2CCMAP_BASE + TWOCCMAP_SPRITE_COUNT, // The sprites used for other airport angles + /* shore tiles - action 05-0D */ + SPR_SHORE_BASE = SPR_2CCMAP_BASE + TWOCCMAP_SPRITE_COUNT, + SPR_SHORE_SPRITE_COUNT = 18, + + SPR_AIRPORTX_BASE = SPR_SHORE_BASE + SPR_SHORE_SPRITE_COUNT, // The sprites used for other airport angles SPR_NEWAIRPORT_TARMAC = SPR_AIRPORTX_BASE, SPR_NSRUNWAY1 = SPR_AIRPORTX_BASE + 1, SPR_NSRUNWAY2 = SPR_AIRPORTX_BASE + 2, @@ -553,17 +557,6 @@ enum Sprites { SPR_FARMLAND_STATE_7 = 4259, SPR_FARMLAND_HAYPACKS = 4278, - /* Shores */ - SPR_NO_SHORE = 0, //used for tileh which have no shore - SPR_SHORE_TILEH_4 = 4062, // SLOPE_E - SPR_SHORE_TILEH_1 = 4063, // SLOPE_W - SPR_SHORE_TILEH_2 = 4064, // SLOPE_S - SPR_SHORE_TILEH_8 = 4065, // SLOPE_N - SPR_SHORE_TILEH_6 = 4066, // SLOPE_SE - SPR_SHORE_TILEH_12 = 4067, // SLOPE_NE - SPR_SHORE_TILEH_3 = 4068, // SLOPE_SW - SPR_SHORE_TILEH_9 = 4069, // SLOPE_NW - /* Water-related sprites */ SPR_SHIP_DEPOT_SE_FRONT = 4070, SPR_SHIP_DEPOT_SW_FRONT = 4071, diff --git a/src/table/station_land.h b/src/table/station_land.h index 6f955daf3..61700bf28 100644 --- a/src/table/station_land.h +++ b/src/table/station_land.h @@ -1168,10 +1168,10 @@ static const DrawTileSprites _station_display_datas_oilrig[] = { }; static const DrawTileSprites _station_display_datas_dock[] = { - { SPR_SHORE_TILEH_3, PAL_NONE, _station_display_datas_76 }, - { SPR_SHORE_TILEH_9, PAL_NONE, _station_display_datas_77 }, - { SPR_SHORE_TILEH_12, PAL_NONE, _station_display_datas_78 }, - { SPR_SHORE_TILEH_6, PAL_NONE, _station_display_datas_79 }, + { SPR_SHORE_BASE + SLOPE_SW, PAL_NONE, _station_display_datas_76 }, + { SPR_SHORE_BASE + SLOPE_NW, PAL_NONE, _station_display_datas_77 }, + { SPR_SHORE_BASE + SLOPE_NE, PAL_NONE, _station_display_datas_78 }, + { SPR_SHORE_BASE + SLOPE_SE, PAL_NONE, _station_display_datas_79 }, { SPR_FLAT_WATER_TILE, PAL_NONE, _station_display_datas_80 }, { SPR_FLAT_WATER_TILE, PAL_NONE, _station_display_datas_81 }, }; |