(svn r10696) -Codechange: remove duplication of the "make sprite transparent" code.

This commit is contained in:
rubidium
2007-07-26 14:07:11 +00:00
parent d031da78d8
commit 02ab86631e
15 changed files with 86 additions and 220 deletions

View File

@@ -1526,10 +1526,7 @@ default_waypoint:
image += relocation;
}
if (HASBIT(_transparent_opt, TO_BUILDINGS)) {
SETBIT(image, PALETTE_MODIFIER_TRANSPARENT);
pal = PALETTE_TO_TRANSPARENT;
} else if (HASBIT(image, PALETTE_MODIFIER_COLOR)) {
if (!HASBIT(_transparent_opt, TO_BUILDINGS) && HASBIT(image, PALETTE_MODIFIER_COLOR)) {
pal = _drawtile_track_palette;
} else {
pal = dtss->pal;
@@ -1540,7 +1537,8 @@ default_waypoint:
image, pal,
ti->x + dtss->delta_x, ti->y + dtss->delta_y,
dtss->size_x, dtss->size_y,
dtss->size_z, ti->z + dtss->delta_z
dtss->size_z, ti->z + dtss->delta_z,
HASBIT(_transparent_opt, TO_BUILDINGS)
);
} else {
AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y);