petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

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

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

13
src/rail_cmd.cpp
View File

@@ -2014,10 +2014,14 @@ default_waypoint:
image += relocation;
}
if (!(!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)) && HasBit(image, PALETTE_MODIFIER_COLOR)) {
pal = _drawtile_track_palette;
if (HasBit(image, PALETTE_MODIFIER_TRANSPARENT) || HasBit(image, PALETTE_MODIFIER_COLOR)) {
if (dtss->image.pal != 0) {
pal = dtss->image.pal;
} else {
pal = _drawtile_track_palette;
}
} else {
pal = dtss->image.pal;
pal = PAL_NONE;
}
if ((byte)dtss->delta_z != 0x80) {
@@ -2029,7 +2033,8 @@ default_waypoint:
!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)
);
} 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));
}
}
}