Mercurial > hg > openttd

diff src/station_cmd.cpp @ 8906:39d12674a79a draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r12674) -Fix [FS#1902]: Colour remaps on station sprites only worked for company colours.
author peter1138 <peter1138@openttd.org>
date Sat, 12 Apr 2008 22:11:21 +0000 (2008-04-12)
parents 748b998a108e
children f15d5f7bf51b
line wrap: on
line diff
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2199,10 +2199,14 @@
 		}
 
 		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) {