@ -403,12 +403,12 @@ static void AddCombinedSprite(uint32 image, int x, int y, byte z)
{
const ViewportDrawer * vd = _cur_vd ;
Point pt = RemapCoords ( x , y , z ) ;
const Sprite Dimension * sd = GetSpriteDimension ( image & SPRITE_MASK ) ;
const Sprite * spr = GetSprite ( image & SPRITE_MASK ) ;
if ( pt . x + s d- > x offs > = vd - > dpi . left + vd - > dpi . width | |
pt . x + s d- > xoffs + sd - > xsize < = vd - > dpi . left | |
pt . y + s d- > y offs > = vd - > dpi . top + vd - > dpi . height | |
pt . y + s d- > yoffs + sd - > ysize < = vd - > dpi . top )
if ( pt . x + s pr- > x_ offs > = vd - > dpi . left + vd - > dpi . width | |
pt . x + s pr- > x_offs + spr - > width < = vd - > dpi . left | |
pt . y + s pr- > y_ offs > = vd - > dpi . top + vd - > dpi . height | |
pt . y + s pr- > y_offs + spr - > height < = vd - > dpi . top )
return ;
AddChildSpriteScreen ( image , pt . x - vd - > parent_list [ - 1 ] - > left , pt . y - vd - > parent_list [ - 1 ] - > top ) ;
@ -419,7 +419,7 @@ void AddSortableSpriteToDraw(uint32 image, int x, int y, int w, int h, byte dz,
{
ViewportDrawer * vd = _cur_vd ;
ParentSpriteToDraw * ps ;
const Sprite Dimension * sd ;
const Sprite * spr ;
Point pt ;
assert ( ( image & SPRITE_MASK ) < MAX_SPRITES ) ;
@ -462,11 +462,11 @@ void AddSortableSpriteToDraw(uint32 image, int x, int y, int w, int h, byte dz,
pt = RemapCoords ( x , y , z ) ;
s d = GetSpriteDimension ( image & SPRITE_MASK ) ;
if ( ( ps - > left = ( pt . x + = s d- > x offs) ) > = vd - > dpi . left + vd - > dpi . width | |
( ps - > right = ( pt . x + sd - > xsize ) ) < = vd - > dpi . left | |
( ps - > top = ( pt . y + = s d- > y offs) ) > = vd - > dpi . top + vd - > dpi . height | |
( ps - > bottom = ( pt . y + sd - > ysize ) ) < = vd - > dpi . top ) {
s pr = GetSprite ( image & SPRITE_MASK ) ;
if ( ( ps - > left = ( pt . x + = s pr- > x_ offs) ) > = vd - > dpi . left + vd - > dpi . width | |
( ps - > right = ( pt . x + spr - > width ) ) < = vd - > dpi . left | |
( ps - > top = ( pt . y + = s pr- > y_ offs) ) > = vd - > dpi . top + vd - > dpi . height | |
( ps - > bottom = ( pt . y + spr - > height ) ) < = vd - > dpi . top ) {
return ;
}