diff options
| author | peter1138 <peter1138@openttd.org> | 2008-04-12 22:11:21 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2008-04-12 22:11:21 +0000 |
| commit | a45c1d45e5b56f0e2f18d03abaa4bd675f9ba55f (patch) | |
| tree | 295dfa2a4a468663505964815b0b08eaa6cc9779 /src/station_cmd.cpp | |
| parent | 711909fa0cd3733cbfb7aee9bd32bc445eec1027 (diff) | |
| download | openttd-a45c1d45e5b56f0e2f18d03abaa4bd675f9ba55f.tar.xz | |
(svn r12674) -Fix [FS#1902]: Colour remaps on station sprites only worked for company colours.
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 30ef4a99d..de8bc268f 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2199,10 +2199,14 @@ static void DrawTile_Station(TileInfo *ti) } SpriteID pal; - if (!(!HasBit(image, SPRITE_MODIFIER_OPAQUE) && IsTransparencySet(TO_BUILDINGS)) && HasBit(image, PALETTE_MODIFIER_COLOR)) { - pal = palette; + if (HasBit(image, PALETTE_MODIFIER_TRANSPARENT) || HasBit(image, PALETTE_MODIFIER_COLOR)) { + if (dtss->image.pal > 0) { + pal = dtss->image.pal; + } else { + pal = palette; + } } else { - pal = dtss->image.pal; + pal = PAL_NONE; } if ((byte)dtss->delta_z != 0x80) { |