dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12149) -Codechange: Merge 'ground_sprite' and 'ground_pal' of DrawTileSprites into one PalSpriteID

Browse Source
This commit is contained in:
frosch
2008-02-15 18:40:42 +00:00
parent fd0f57a794
commit a40d761d7f
13 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/table/road_land.h
View File

@@ -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

2
src/table/station_land.h
View File

@@ -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)

12
src/table/track_land.h
View File

@@ -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

2
src/table/unmovable_land.h
View File

@@ -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)