Mercurial > hg > openttd

changeset 7825:8791573e7431 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r11375) -Fix [FS#1397]: the industry recolour map was always applied when recolouring was turned on, instead of only applying it when the colour translation is '0'.
author rubidium <rubidium@openttd.org>
date Sun, 04 Nov 2007 11:28:36 +0000
parents 7ae5bda4e8dd
children 4ea8c684b2d1
files src/newgrf_industrytiles.cpp
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf_industrytiles.cpp
+++ b/src/newgrf_industrytiles.cpp
@@ -182,7 +182,9 @@
 		if (IS_CUSTOM_SPRITE(image)) image += stage;
 
 		if (HASBIT(image, PALETTE_MODIFIER_COLOR)) {
-			pal = GENERAL_SPRITE_COLOR(rnd_color);
+			if (pal == 0) {
+				pal = GENERAL_SPRITE_COLOR(rnd_color);
+			}
 		} else {
 			pal = PAL_NONE;
 		}