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/rail_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/rail_cmd.cpp')
| -rw-r--r-- | src/rail_cmd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index bb9e4805d..ffbbc1d3d 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -1821,7 +1821,7 @@ default_waypoint: if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti); foreach_draw_tile_seq(dtss, dts->seq) { - SpriteID image = dtss->image; + SpriteID image = dtss->image.sprite; SpriteID pal; /* Unlike stations, our default waypoint has no variation for @@ -1836,7 +1836,7 @@ default_waypoint: if (!(!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)) && HasBit(image, PALETTE_MODIFIER_COLOR)) { pal = _drawtile_track_palette; } else { - pal = dtss->pal; + pal = dtss->image.pal; } if ((byte)dtss->delta_z != 0x80) { @@ -1861,9 +1861,9 @@ static void DrawTileSequence(int x, int y, SpriteID ground, const DrawTileSeqStr SpriteID palette = PLAYER_SPRITE_COLOR(_local_player); DrawSprite(ground, PAL_NONE, x, y); - for (; dtss->image != 0; dtss++) { + for (; dtss->image.sprite != 0; dtss++) { Point pt = RemapCoords(dtss->delta_x, dtss->delta_y, dtss->delta_z); - SpriteID image = dtss->image + offset; + SpriteID image = dtss->image.sprite + offset; DrawSprite(image, HasBit(image, PALETTE_MODIFIER_COLOR) ? palette : PAL_NONE, x + pt.x, y + pt.y); } |