mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18889) -Codechange: Use (GroundSprite|SpriteLayout)PaletteTransform() also for drawing of default industries. They are compatible since the bubblegenerator is also randomly recoloured.

release/1.0
frosch 2010-01-22 21:52:20 +00:00
parent 6260d243ee
commit bf65eb686e
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/industry_cmd.cpp
View File

@ -310,8 +310,6 @@ static void DrawTile_Industry(TileInfo *ti)
Industry *ind = Industry::GetByTile(ti->tile); Industry *ind = Industry::GetByTile(ti->tile);
const IndustryTileSpec *indts = GetIndustryTileSpec(gfx); const IndustryTileSpec *indts = GetIndustryTileSpec(gfx);
const DrawBuildingsTileStruct *dits; const DrawBuildingsTileStruct *dits;
SpriteID image;
PaletteID pal;
/* Retrieve pointer to the draw industry tile struct */ /* Retrieve pointer to the draw industry tile struct */
if (gfx >= NEW_INDUSTRYTILEOFFSET) { if (gfx >= NEW_INDUSTRYTILEOFFSET) {
@ -336,12 +334,7 @@ static void DrawTile_Industry(TileInfo *ti)
GetIndustryAnimationState(ti->tile) & INDUSTRY_COMPLETED : GetIndustryAnimationState(ti->tile) & INDUSTRY_COMPLETED :
GetIndustryConstructionStage(ti->tile))]; GetIndustryConstructionStage(ti->tile))];
image = dits->ground.sprite; SpriteID image = dits->ground.sprite;
if (HasBit(image, PALETTE_MODIFIER_COLOUR) && dits->ground.pal == PAL_NONE) {
pal = GENERAL_SPRITE_COLOUR(ind->random_colour);
} else {
pal = dits->ground.pal;
}
/* DrawFoundation() modifes ti->z and ti->tileh */ /* DrawFoundation() modifes ti->z and ti->tileh */
if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, FOUNDATION_LEVELED); if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, FOUNDATION_LEVELED);
@ -351,7 +344,7 @@ static void DrawTile_Industry(TileInfo *ti)
if (image == SPR_FLAT_WATER_TILE && IsIndustryTileOnWater(ti->tile)) { if (image == SPR_FLAT_WATER_TILE && IsIndustryTileOnWater(ti->tile)) {
DrawWaterClassGround(ti); DrawWaterClassGround(ti);
} else { } else {
DrawGroundSprite(image, pal); DrawGroundSprite(image, GroundSpritePaletteTransform(image, dits->ground.pal, GENERAL_SPRITE_COLOUR(ind->random_colour)));
} }
/* If industries are transparent and invisible, do not draw the upper part */ /* If industries are transparent and invisible, do not draw the upper part */
@ -360,8 +353,7 @@ static void DrawTile_Industry(TileInfo *ti)
/* Add industry on top of the ground? */ /* Add industry on top of the ground? */
image = dits->building.sprite; image = dits->building.sprite;
if (image != 0) { if (image != 0) {
AddSortableSpriteToDraw(image, AddSortableSpriteToDraw(image, SpriteLayoutPaletteTransform(image, dits->building.pal, GENERAL_SPRITE_COLOUR(ind->random_colour)),
(HasBit(image, PALETTE_MODIFIER_COLOUR) && dits->building.pal == PAL_NONE) ? GENERAL_SPRITE_COLOUR(ind->random_colour) : dits->building.pal,
ti->x + dits->subtile_x, ti->x + dits->subtile_x,
ti->y + dits->subtile_y, ti->y + dits->subtile_y,
dits->width, dits->width,