Mercurial > hg > openttd

comparison src/station_cmd.cpp @ 8158:e2bea11667fd draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r11720) -Codechange: [NewGRF] Add support for bit 30 of station tile layouts; forcing a sprite to always be opaque.
author peter1138 <peter1138@openttd.org>
date Sat, 29 Dec 2007 21:06:54 +0000
parents d18c8a0bb638
children 8b399c358b85
comparison
equal deleted inserted replaced
8157:019833e42fda 8158:e2bea11667fd
2158 } else { 2158 } else {
2159 image += relocation; 2159 image += relocation;
2160 } 2160 }
2161 2161
2162 SpriteID pal; 2162 SpriteID pal;
2163 if (!IsTransparencySet(TO_BUILDINGS) && HasBit(image, PALETTE_MODIFIER_COLOR)) { 2163 if (!(!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)) && HasBit(image, PALETTE_MODIFIER_COLOR)) {
2164 pal = palette; 2164 pal = palette;
2165 } else { 2165 } else {
2166 pal = dtss->pal; 2166 pal = dtss->pal;
2167 } 2167 }
2168 2168
2170 AddSortableSpriteToDraw( 2170 AddSortableSpriteToDraw(
2171 image, pal, 2171 image, pal,
2172 ti->x + dtss->delta_x, ti->y + dtss->delta_y, 2172 ti->x + dtss->delta_x, ti->y + dtss->delta_y,
2173 dtss->size_x, dtss->size_y, 2173 dtss->size_x, dtss->size_y,
2174 dtss->size_z, ti->z + dtss->delta_z, 2174 dtss->size_z, ti->z + dtss->delta_z,
2175 IsTransparencySet(TO_BUILDINGS) 2175 !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)
2176 ); 2176 );
2177 } else { 2177 } else {
2178 AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y, IsTransparencySet(TO_BUILDINGS)); 2178 AddChildSpriteScreen(image, pal, dtss->delta_x, dtss->delta_y, IsTransparencySet(TO_BUILDINGS));
2179 } 2179 }
2180 } 2180 }