diff options
| author | frosch <frosch@openttd.org> | 2008-02-15 18:40:42 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-02-15 18:40:42 +0000 |
| commit | a40d761d7fc608359b46694f7259c2699ef8cf0c (patch) | |
| tree | 2cd7d2f6b962e9d7a99091f185e1a5aa591f0784 /src/table | |
| parent | fd0f57a79485641b632da4525e28ae397c892e54 (diff) | |
| download | openttd-a40d761d7fc608359b46694f7259c2699ef8cf0c.tar.xz | |
(svn r12149) -Codechange: Merge 'ground_sprite' and 'ground_pal' of DrawTileSprites into one PalSpriteID
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/road_land.h | 16 | ||||
| -rw-r--r-- | src/table/station_land.h | 2 | ||||
| -rw-r--r-- | src/table/track_land.h | 12 | ||||
| -rw-r--r-- | src/table/unmovable_land.h | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/table/road_land.h b/src/table/road_land.h index 32980606a..2f8891692 100644 --- a/src/table/road_land.h +++ b/src/table/road_land.h @@ -26,10 +26,10 @@ static const DrawTileSeqStruct _road_depot_NW[] = { }; static const DrawTileSprites _road_depot[] = { - { 0xA4A, PAL_NONE, _road_depot_NE }, - { 0xA4A, PAL_NONE, _road_depot_SE }, - { 0xA4A, PAL_NONE, _road_depot_SW }, - { 0xA4A, PAL_NONE, _road_depot_NW } + { {0xA4A, PAL_NONE}, _road_depot_NE }, + { {0xA4A, PAL_NONE}, _road_depot_SE }, + { {0xA4A, PAL_NONE}, _road_depot_SW }, + { {0xA4A, PAL_NONE}, _road_depot_NW } }; static const DrawTileSeqStruct _tram_depot_NE[] = { @@ -55,10 +55,10 @@ static const DrawTileSeqStruct _tram_depot_NW[] = { }; static const DrawTileSprites _tram_depot[] = { - { 0xA4A, PAL_NONE, _tram_depot_NE }, - { 0xA4A, PAL_NONE, _tram_depot_SE }, - { 0xA4A, PAL_NONE, _tram_depot_SW }, - { 0xA4A, PAL_NONE, _tram_depot_NW } + { {0xA4A, PAL_NONE}, _tram_depot_NE }, + { {0xA4A, PAL_NONE}, _tram_depot_SE }, + { {0xA4A, PAL_NONE}, _tram_depot_SW }, + { {0xA4A, PAL_NONE}, _tram_depot_NW } }; #undef TILE_SEQ_LINE diff --git a/src/table/station_land.h b/src/table/station_land.h index 87523d5f5..b0fa4b366 100644 --- a/src/table/station_land.h +++ b/src/table/station_land.h @@ -993,7 +993,7 @@ static const DrawTileSeqStruct _station_display_datas_0171[] = { #undef TILE_SEQ_LINE #undef TILE_SEQ_LINE_PAL -#define TILE_SPRITE_LINE(img, dtss) { img, PAL_NONE, dtss }, +#define TILE_SPRITE_LINE(img, dtss) { {img, PAL_NONE}, dtss }, static const DrawTileSprites _station_display_datas_rail[] = { TILE_SPRITE_LINE(SPR_RAIL_TRACK_X, _station_display_datas_0) diff --git a/src/table/track_land.h b/src/table/track_land.h index 176c35399..920595cb1 100644 --- a/src/table/track_land.h +++ b/src/table/track_land.h @@ -27,10 +27,10 @@ static const DrawTileSeqStruct _depot_gfx_NW[] = { }; static const DrawTileSprites _depot_gfx_table[] = { - { SPR_FLAT_GRASS_TILE, PAL_NONE, _depot_gfx_NE }, - { SPR_RAIL_TRACK_Y, PAL_NONE, _depot_gfx_SE }, - { SPR_RAIL_TRACK_X, PAL_NONE, _depot_gfx_SW }, - { SPR_FLAT_GRASS_TILE, PAL_NONE, _depot_gfx_NW } + { {SPR_FLAT_GRASS_TILE, PAL_NONE}, _depot_gfx_NE }, + { {SPR_RAIL_TRACK_Y, PAL_NONE}, _depot_gfx_SE }, + { {SPR_RAIL_TRACK_X, PAL_NONE}, _depot_gfx_SW }, + { {SPR_FLAT_GRASS_TILE, PAL_NONE}, _depot_gfx_NW } }; @@ -47,8 +47,8 @@ static const DrawTileSeqStruct _waypoint_gfx_Y[] = { }; static const DrawTileSprites _waypoint_gfx_table[] = { - { SPR_RAIL_TRACK_X, PAL_NONE, _waypoint_gfx_X }, - { SPR_RAIL_TRACK_Y, PAL_NONE, _waypoint_gfx_Y } + { {SPR_RAIL_TRACK_X, PAL_NONE}, _waypoint_gfx_X }, + { {SPR_RAIL_TRACK_Y, PAL_NONE}, _waypoint_gfx_Y } }; #undef TILE_SEQ_LINE diff --git a/src/table/unmovable_land.h b/src/table/unmovable_land.h index 123698181..887e432bf 100644 --- a/src/table/unmovable_land.h +++ b/src/table/unmovable_land.h @@ -70,7 +70,7 @@ static const DrawTileSeqStruct _unmovable_display_datas_18[] = { #undef TILE_SEQ_LINE #undef TILE_SEQ_END -#define TILE_SPRITE_LINE(img, dtss) { img | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, dtss }, +#define TILE_SPRITE_LINE(img, dtss) { {img | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE}, dtss }, static const DrawTileSprites _unmovable_display_datas[] = { TILE_SPRITE_LINE(0xA2B, _unmovable_display_nothing) |