petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

20
src/viewport.cpp
View File

@@ -478,8 +478,18 @@ static void AddCombinedSprite(SpriteID image, SpriteID pal, int x, int y, byte z
AddChildSpriteScreen(image, pal, pt.x - vd->parent_list[-1]->left, pt.y - vd->parent_list[-1]->top);
}
void AddSortableSpriteToDraw(SpriteID image, SpriteID pal, int x, int y, int w, int h, byte dz, byte z)
/** Draw a (transparent) sprite at given coordinates
* @param image the image to combine and draw,
* @param pal the provided palette,
* @param x position x of the sprite,
* @param y position y of the sprite,
* @param w width of the sprite,
* @param h height of the sprite,
* @param dz delta z, difference of elevation between sprite and parent sprite,
* @param z elevation of the sprite,
* @param transparent if true, switch the palette between the provided palette and the transparent palette
*/
void AddSortableSpriteToDraw(SpriteID image, SpriteID pal, int x, int y, int w, int h, byte dz, byte z, bool transparent)
{
ViewportDrawer *vd = _cur_vd;
ParentSpriteToDraw *ps;
@@ -488,6 +498,12 @@ void AddSortableSpriteToDraw(SpriteID image, SpriteID pal, int x, int y, int w,
assert((image & SPRITE_MASK) < MAX_SPRITES);
/* make the sprites transparent with the right palette */
if (transparent) {
SETBIT(image, PALETTE_MODIFIER_TRANSPARENT);
pal = PALETTE_TO_TRANSPARENT;
}
if (vd->combine_sprites == 2) {
AddCombinedSprite(image, pal, x, y, z);
return;