mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r4763) - Newstations: revert r4762, instead map bit the palette modifier from bit 14 to bit 31 on GRF load.

release/0.5
peter1138 2006-05-06 22:55:21 +00:00
parent b0f40692d8
commit ec1edb127a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
newgrf.c
View File

@ -854,7 +854,15 @@ static bool StationChangeInfo(uint stid, int numinfo, int prop, byte **bufp, int
dtss->width = grf_load_byte(&buf); dtss->width = grf_load_byte(&buf);
dtss->height = grf_load_byte(&buf); dtss->height = grf_load_byte(&buf);
dtss->unk = 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;
} }
} }
} }

1
station_cmd.c
View File

@ -2060,7 +2060,6 @@ static void DrawTile_Station(TileInfo *ti)
if ((byte)dtss->delta_z != 0x80) { if ((byte)dtss->delta_z != 0x80) {
AddSortableSpriteToDraw(image, ti->x + dtss->delta_x, ti->y + dtss->delta_y, dtss->width, dtss->height, dtss->unk, ti->z + dtss->delta_z); AddSortableSpriteToDraw(image, ti->x + dtss->delta_x, ti->y + dtss->delta_y, dtss->width, dtss->height, dtss->unk, ti->z + dtss->delta_z);
} else { } else {
MAKE_TRANSPARENT(image);
AddChildSpriteScreen(image, dtss->delta_x, dtss->delta_y); AddChildSpriteScreen(image, dtss->delta_x, dtss->delta_y);
} }
} }