1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-29 21:56:54 +02:00

Possible fix for neutral palette (1867)

This commit is contained in:
Ivan Savenko 2014-08-07 19:52:40 +03:00
parent d1dd7eef48
commit 66c4d469f8

@ -60,7 +60,7 @@ void Graphics::loadPaletteAndColors()
col.r = pals[startPoint++]; col.r = pals[startPoint++];
col.g = pals[startPoint++]; col.g = pals[startPoint++];
col.b = pals[startPoint++]; col.b = pals[startPoint++];
CSDL_Ext::colorSetAlpha(col,SDL_ALPHA_OPAQUE); CSDL_Ext::colorSetAlpha(col,SDL_ALPHA_OPAQUE);
startPoint++; startPoint++;
playerColorPalette[i] = col; playerColorPalette[i] = col;
} }
@ -75,7 +75,8 @@ void Graphics::loadPaletteAndColors()
neutralColorPalette[i].r = reader.readUInt8(); neutralColorPalette[i].r = reader.readUInt8();
neutralColorPalette[i].g = reader.readUInt8(); neutralColorPalette[i].g = reader.readUInt8();
neutralColorPalette[i].b = reader.readUInt8(); neutralColorPalette[i].b = reader.readUInt8();
CSDL_Ext::colorSetAlpha(neutralColorPalette[i], !reader.readUInt8()); reader.readUInt8(); // this is "flags" entry, not alpha
CSDL_Ext::colorSetAlpha(neutralColorPalette[i], SDL_ALPHA_OPAQUE);
} }
//colors initialization //colors initialization
SDL_Color colors[] = { SDL_Color colors[] = {