summaryrefslogtreecommitdiff
path: root/newgrf.c
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-05-06 22:55:21 +0000
committerpeter1138 <peter1138@openttd.org>2006-05-06 22:55:21 +0000
commitec1edb127a3480e4ae6f6227487fbf50e0206805 (patch)
tree6de8f5e5c1bec31c3b32e8408ca65e97ca559a80 /newgrf.c
parentb0f40692d8c029167c51d5cd0b39b7c5f4ef0060 (diff)
downloadopenttd-ec1edb127a3480e4ae6f6227487fbf50e0206805.tar.xz
(svn r4763) - Newstations: revert r4762, instead map bit the palette modifier from bit 14 to bit 31 on GRF load.
Diffstat (limited to 'newgrf.c')
-rw-r--r--newgrf.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/newgrf.c b/newgrf.c
index 47192c214..d1dec9a22 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -854,7 +854,15 @@ static bool StationChangeInfo(uint stid, int numinfo, int prop, byte **bufp, int
dtss->width = grf_load_byte(&buf);
dtss->height = grf_load_byte(&buf);
dtss->unk = grf_load_byte(&buf);
- dtss->image = grf_load_dword(&buf) - 0x42d;
+ dtss->image = grf_load_dword(&buf);
+
+ /* Remap the colour map bit from 14 to 31 */
+ if (HASBIT(dtss->image, 14)) {
+ CLRBIT(dtss->image, 14);
+ SETBIT(dtss->image, 31);
+ }
+
+ dtss->image -= 0x42D;
}
}
}