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

(svn r14488) -Fix: Synchronize drawing of spritelayouts in DrawTileLayout (Houses), IndustryDrawTileLayout, DrawStationTile, DrawTile_Station and DrawTile_Track (Waypoint). 

Now transparency options, PALETTE_MODIFIER_TRANSPARENT and SPRITE_MODIFIER_OPAQUE should work for all of them.
release/0.7
frosch 2008-10-18 17:21:56 +00:00
parent 2e6894b7bb
commit 5a1df325e2
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/newgrf_house.cpp
View File

@ -421,7 +421,7 @@ uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, House
return group->g.callback.result; return group->g.callback.result;
} }
void DrawTileLayout(const TileInfo *ti, const SpriteGroup *group, byte stage, HouseID house_id) static void DrawTileLayout(const TileInfo *ti, const SpriteGroup *group, byte stage, HouseID house_id)
{ {
const DrawTileSprites *dts = group->g.layout.dts; const DrawTileSprites *dts = group->g.layout.dts;
const DrawTileSeqStruct *dtss; const DrawTileSeqStruct *dtss;
@ -444,7 +444,7 @@ void DrawTileLayout(const TileInfo *ti, const SpriteGroup *group, byte stage, Ho
if (IS_CUSTOM_SPRITE(image)) image += stage; if (IS_CUSTOM_SPRITE(image)) image += stage;
if ((HasBit(image, SPRITE_MODIFIER_OPAQUE) || !IsTransparencySet(TO_HOUSES)) && HasBit(image, PALETTE_MODIFIER_COLOR)) { if (HasBit(image, PALETTE_MODIFIER_TRANSPARENT) || HasBit(image, PALETTE_MODIFIER_COLOR)) {
if (pal == 0) { if (pal == 0) {
const HouseSpec *hs = GetHouseSpecs(house_id); const HouseSpec *hs = GetHouseSpecs(house_id);
if (HasBit(hs->callback_mask, CBM_HOUSE_COLOUR)) { if (HasBit(hs->callback_mask, CBM_HOUSE_COLOUR)) {
@ -467,10 +467,11 @@ void DrawTileLayout(const TileInfo *ti, const SpriteGroup *group, byte stage, Ho
ti->x + dtss->delta_x, ti->y + dtss->delta_y, ti->x + dtss->delta_x, ti->y + dtss->delta_y,
dtss->size_x, dtss->size_y, dtss->size_x, dtss->size_y,
dtss->size_z, ti->z + dtss->delta_z, dtss->size_z, ti->z + dtss->delta_z,
IsTransparencySet(TO_HOUSES) !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_HOUSES)
); );
} else { } else {
AddChildSpriteScreen(image, pal, (byte)dtss->delta_x, (byte)dtss->delta_y, IsTransparencySet(TO_HOUSES)); /* For industries and houses delta_x and delta_y are unsigned */
AddChildSpriteScreen(image, pal, (byte)dtss->delta_x, (byte)dtss->delta_y, !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_HOUSES));
} }
} }
} }

7
src/newgrf_industrytiles.cpp
View File

@ -167,7 +167,7 @@ static void NewIndustryTileResolver(ResolverObject *res, IndustryGfx gfx, TileIn
res->grffile = (its != NULL ? its->grf_prop.grffile : NULL); res->grffile = (its != NULL ? its->grf_prop.grffile : NULL);
} }
void IndustryDrawTileLayout(const TileInfo *ti, const SpriteGroup *group, byte rnd_color, byte stage, IndustryGfx gfx) static void IndustryDrawTileLayout(const TileInfo *ti, const SpriteGroup *group, byte rnd_color, byte stage, IndustryGfx gfx)
{ {
const DrawTileSprites *dts = group->g.layout.dts; const DrawTileSprites *dts = group->g.layout.dts;
const DrawTileSeqStruct *dtss; const DrawTileSeqStruct *dtss;
@ -198,7 +198,7 @@ void IndustryDrawTileLayout(const TileInfo *ti, const SpriteGroup *group, byte r
if (IS_CUSTOM_SPRITE(image)) image += stage; if (IS_CUSTOM_SPRITE(image)) image += stage;
if (HasBit(image, PALETTE_MODIFIER_COLOR)) { if (HasBit(image, PALETTE_MODIFIER_TRANSPARENT) || HasBit(image, PALETTE_MODIFIER_COLOR)) {
if (pal == 0) { if (pal == 0) {
pal = GENERAL_SPRITE_COLOR(rnd_color); pal = GENERAL_SPRITE_COLOR(rnd_color);
} }
@ -215,7 +215,8 @@ void IndustryDrawTileLayout(const TileInfo *ti, const SpriteGroup *group, byte r
!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_INDUSTRIES) !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_INDUSTRIES)
); );
} else { } else {
AddChildSpriteScreen(image, pal, (byte)dtss->delta_x, (byte)dtss->delta_y, IsTransparencySet(TO_INDUSTRIES)); /* For industries and houses delta_x and delta_y are unsigned */
AddChildSpriteScreen(image, pal, (byte)dtss->delta_x, (byte)dtss->delta_y, !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_INDUSTRIES));
} }
} }
} }

13
src/rail_cmd.cpp
View File

@ -2014,10 +2014,14 @@ default_waypoint:
image += relocation; image += relocation;
} }
if (!(!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)) && HasBit(image, PALETTE_MODIFIER_COLOR)) { if (HasBit(image, PALETTE_MODIFIER_TRANSPARENT) || HasBit(image, PALETTE_MODIFIER_COLOR)) {
pal = _drawtile_track_palette; if (dtss->image.pal != 0) {
pal = dtss->image.pal;
} else {
pal = _drawtile_track_palette;
}
} else { } else {
pal = dtss->image.pal; pal = PAL_NONE;
} }
if ((byte)dtss->delta_z != 0x80) { if ((byte)dtss->delta_z != 0x80) {
@ -2029,7 +2033,8 @@ default_waypoint:
!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS) !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)
); );
} else { } else {
AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y); /* For stations and original spritelayouts delta_x and delta_y are signed */
AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y, !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS));
} }
} }
} }

3
src/station_cmd.cpp
View File

@ -2344,7 +2344,8 @@ static void DrawTile_Station(TileInfo *ti)
!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS) !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)
); );
} else { } else {
AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y, IsTransparencySet(TO_BUILDINGS)); /* For stations and original spritelayouts delta_x and delta_y are signed */
AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y, !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS));
} }
} }
} }