equal
deleted
inserted
replaced
2197 } else { |
2197 } else { |
2198 image += relocation; |
2198 image += relocation; |
2199 } |
2199 } |
2200 |
2200 |
2201 SpriteID pal; |
2201 SpriteID pal; |
2202 if (!(!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)) && HasBit(image, PALETTE_MODIFIER_COLOR)) { |
2202 if (HasBit(image, PALETTE_MODIFIER_TRANSPARENT) || HasBit(image, PALETTE_MODIFIER_COLOR)) { |
2203 pal = palette; |
2203 if (dtss->image.pal > 0) { |
|
2204 pal = dtss->image.pal; |
|
2205 } else { |
|
2206 pal = palette; |
|
2207 } |
2204 } else { |
2208 } else { |
2205 pal = dtss->image.pal; |
2209 pal = PAL_NONE; |
2206 } |
2210 } |
2207 |
2211 |
2208 if ((byte)dtss->delta_z != 0x80) { |
2212 if ((byte)dtss->delta_z != 0x80) { |
2209 AddSortableSpriteToDraw( |
2213 AddSortableSpriteToDraw( |
2210 image, pal, |
2214 image, pal, |