mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r18840) -Codechange: Use DrawCommonTileSeq[InGUI] for roaddepot drawing.

This commit is contained in:
frosch 2010-01-16 22:52:51 +00:00
parent 381bf04bab
commit 2e9529aff3
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/road_cmd.cpp
View File

@ -1223,28 +1223,7 @@ static void DrawTile_Road(TileInfo *ti)
}
DrawGroundSprite(dts->ground.sprite, PAL_NONE);
/* End now if buildings are invisible */
if (IsInvisibilitySet(TO_BUILDINGS)) break;
for (const DrawTileSeqStruct *dtss = dts->seq; dtss->image.sprite != 0; dtss++) {
SpriteID image = dtss->image.sprite;
SpriteID pal;
if (!IsTransparencySet(TO_BUILDINGS) && HasBit(image, PALETTE_MODIFIER_COLOUR)) {
pal = palette;
} else {
pal = PAL_NONE;
}
AddSortableSpriteToDraw(
image, pal,
ti->x + dtss->delta_x, ti->y + dtss->delta_y,
dtss->size_x, dtss->size_y,
dtss->size_z, ti->z,
IsTransparencySet(TO_BUILDINGS)
);
}
DrawCommonTileSeq(ti, dts, TO_BUILDINGS, 0, 0, palette);
break;
}
}
@ -1260,13 +1239,7 @@ void DrawRoadDepotSprite(int x, int y, DiagDirection dir, RoadType rt)
y += 17;
DrawSprite(dts->ground.sprite, PAL_NONE, x, y);
for (const DrawTileSeqStruct *dtss = dts->seq; dtss->image.sprite != 0; dtss++) {
Point pt = RemapCoords(dtss->delta_x, dtss->delta_y, dtss->delta_z);
SpriteID image = dtss->image.sprite;
DrawSprite(image, HasBit(image, PALETTE_MODIFIER_COLOUR) ? palette : PAL_NONE, x + pt.x, y + pt.y);
}
DrawCommonTileSeqInGUI(x, y, dts, 0, 0, palette);
}
/**

2
src/table/road_land.h
View File

@ -10,7 +10,7 @@
/** @file road_land.h Sprite constructs for road depots. */
#define TILE_SEQ_LINE(img, pal, dx, dy, sx, sy) { dx, dy, 0, sx, sy, 20, {img, pal} },
#define TILE_SEQ_END() { 0, 0, 0, 0, 0, 0, {0, 0} }
#define TILE_SEQ_END() { (int8)0x80, 0, 0, 0, 0, 0, {0, 0} }
static const DrawTileSeqStruct _road_depot_NE[] = {
TILE_SEQ_LINE(0x584 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 15, 16, 1)