diff options
| author | frosch <frosch@openttd.org> | 2008-02-15 18:34:26 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-02-15 18:34:26 +0000 |
| commit | fd0f57a79485641b632da4525e28ae397c892e54 (patch) | |
| tree | 544af23a50941f98e7474ad050d5e19ccf172f8c /src/station_cmd.cpp | |
| parent | cedca22c6010ec5fe8aedf375177981d0a5e8962 (diff) | |
| download | openttd-fd0f57a79485641b632da4525e28ae397c892e54.tar.xz | |
(svn r12148) -Codechange: Merge 'image' and 'pal' of DrawTileSeqStruct into one PalSpriteID
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index b2219c1cb..95f7e4fd1 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2190,7 +2190,7 @@ static void DrawTile_Station(TileInfo *ti) const DrawTileSeqStruct *dtss; foreach_draw_tile_seq(dtss, t->seq) { - SpriteID image = dtss->image; + SpriteID image = dtss->image.sprite; if (relocation == 0 || HasBit(image, SPRITE_MODIFIER_USE_OFFSET)) { image += total_offset; } else { @@ -2201,7 +2201,7 @@ static void DrawTile_Station(TileInfo *ti) if (!(!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)) && HasBit(image, PALETTE_MODIFIER_COLOR)) { pal = palette; } else { - pal = dtss->pal; + pal = dtss->image.pal; } if ((byte)dtss->delta_z != 0x80) { @@ -2239,7 +2239,7 @@ void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, Ro const DrawTileSeqStruct *dtss; foreach_draw_tile_seq(dtss, t->seq) { Point pt = RemapCoords(dtss->delta_x, dtss->delta_y, dtss->delta_z); - DrawSprite(dtss->image + total_offset, pal, x + pt.x, y + pt.y); + DrawSprite(dtss->image.sprite + total_offset, pal, x + pt.x, y + pt.y); } } |