thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GOB: Fix const away cast warning.

Browse source 
Thanks to DrMcCoy for looking over this.
This commit is contained in:
Johannes Schickel 2013-01-06 20:51:50 +01:00
parent 98cfb57dd3
commit 71304b6e77
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
engines/gob/inter_v7.cpp
View file

@ -554,18 +554,27 @@ void Inter_v7::o7_loadIFFPalette() {
return; return;
} }
byte *palette = (byte *)decoder.getPalette(); const byte *palette = decoder.getPalette();
memset(palette , 0x00, 3);
memset(palette + 765, 0xFF, 3);
for (int i = 0; i < 768; i++)
palette[i] >>= 2;
int16 count = stopIndex - startIndex + 1;
startIndex *= 3; startIndex *= 3;
count *= 3; stopIndex *= 3;
byte *dst = (byte *)_vm->_draw->_vgaPalette + startIndex;
const byte *src = palette + startIndex;
for (int i = startIndex; i <= stopIndex + 2; ++i) {
*dst++ = *src++ >> 2;
}
if (startIndex == 0) {
dst = (byte *)_vm->_draw->_vgaPalette;
dst[0] = dst[1] = dst[2] = 0x00 >> 2;
}
if (stopIndex == 765) {
dst = (byte *)_vm->_draw->_vgaPalette + 765;
dst[0] = dst[1] = dst[2] = 0xFF >> 2;
}
memcpy((char *)_vm->_draw->_vgaPalette + startIndex, palette + startIndex, count);
_vm->_video->setFullPalette(_vm->_global->_pPaletteDesc); _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
} }