mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r22416) -Fix: When action14 specified different values for the palette, the values were OR-ed. Use the last set value instead.

This commit is contained in:
frosch 2011-05-03 20:19:57 +00:00
parent 3c86fddf4e
commit dbfd156eb6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/newgrf.cpp
View File

@ -6527,15 +6527,20 @@ static bool ChangeGRFPalette(size_t len, ByteReader *buf)
buf->Skip(len);
} else {
char data = buf->ReadByte();
GRFPalette pal = GRFP_GRF_UNSET;
switch (data) {
case '*':
case 'A': _cur_grfconfig->palette |= GRFP_GRF_ANY; break;
case 'W': _cur_grfconfig->palette |= GRFP_GRF_WINDOWS; break;
case 'D': _cur_grfconfig->palette |= GRFP_GRF_DOS; break;
case 'A': pal = GRFP_GRF_ANY; break;
case 'W': pal = GRFP_GRF_WINDOWS; break;
case 'D': pal = GRFP_GRF_DOS; break;
default:
grfmsg(2, "StaticGRFInfo: unexpected value '%02x' for 'INFO'->'PALS', ignoring this field", data);
break;
}
if (pal != GRFP_GRF_UNSET) {
_cur_grfconfig->palette &= ~GRFP_GRF_MASK;
_cur_grfconfig->palette |= pal;
}
}
return true;
}