gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-08 23:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18959) -Feature: [NewGRF] Allow layering of multiple groundsprites in spritelayouts of stations, houses and industrytiles; so hacks with zero-sized bounding boxes are no longer needed and no longer cause trouble.

Browse Source
This commit is contained in:
frosch 2010-01-30 10:08:39 +00:00
parent 5c9cb9648b
commit 9e4a62d1ee
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sprite.cpp
View File

@ -30,6 +30,7 @@
*/ */
void DrawCommonTileSeq(const TileInfo *ti, const DrawTileSprites *dts, TransparencyOption to, int32 orig_offset, uint32 newgrf_offset, PaletteID default_palette, bool child_offset_is_unsigned) void DrawCommonTileSeq(const TileInfo *ti, const DrawTileSprites *dts, TransparencyOption to, int32 orig_offset, uint32 newgrf_offset, PaletteID default_palette, bool child_offset_is_unsigned)
{ {
bool parent_sprite_encountered = false;
const DrawTileSeqStruct *dtss; const DrawTileSeqStruct *dtss;
foreach_draw_tile_seq(dtss, dts->seq) { foreach_draw_tile_seq(dtss, dts->seq) {
SpriteID image = dtss->image.sprite; SpriteID image = dtss->image.sprite;
@ -45,6 +46,7 @@ void DrawCommonTileSeq(const TileInfo *ti, const DrawTileSprites *dts, Transpare
PaletteID pal = SpriteLayoutPaletteTransform(image, dtss->image.pal, default_palette); PaletteID pal = SpriteLayoutPaletteTransform(image, dtss->image.pal, default_palette);
if ((byte)dtss->delta_z != 0x80) { if ((byte)dtss->delta_z != 0x80) {
parent_sprite_encountered = true;
AddSortableSpriteToDraw( AddSortableSpriteToDraw(
image, pal, image, pal,
ti->x + dtss->delta_x, ti->y + dtss->delta_y, ti->x + dtss->delta_x, ti->y + dtss->delta_y,
@ -55,7 +57,16 @@ void DrawCommonTileSeq(const TileInfo *ti, const DrawTileSprites *dts, Transpare
} else { } else {
int offs_x = child_offset_is_unsigned ? (uint8)dtss->delta_x : dtss->delta_x; int offs_x = child_offset_is_unsigned ? (uint8)dtss->delta_x : dtss->delta_x;
int offs_y = child_offset_is_unsigned ? (uint8)dtss->delta_y : dtss->delta_y; int offs_y = child_offset_is_unsigned ? (uint8)dtss->delta_y : dtss->delta_y;
AddChildSpriteScreen(image, pal, offs_x, offs_y, !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(to)); bool transparent = !HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(to);
if (parent_sprite_encountered) {
AddChildSpriteScreen(image, pal, offs_x, offs_y, transparent);
} else {
if (transparent) {
SetBit(image, PALETTE_MODIFIER_TRANSPARENT);
pal = PALETTE_TO_TRANSPARENT;
}
DrawGroundSprite(image, pal, NULL, offs_x, offs_y);
}
} }
} }
} }