libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-22 12:12:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tinsel: changed PSX CLUT converter to report effective number of colours used in the palette

Browse Source 
svn-id: r40151
This commit is contained in:
Fabio Battaglia 2009-04-26 10:25:41 +00:00
parent 5eb4bdce66
commit b45f2e21fa
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/tinsel/palette.cpp
View File

@ -94,9 +94,10 @@ static int maxDACQ = 0;
/**
* Convert Discworld PSX 555 CLUTs to compatible 888 palette
*/
COLORREF* psxClutToRGBPal(uint8 *srcClut) {
COLORREF* psxClutToRGBPal(uint8 *srcClut, int *colours) {
uint8 red, green, blue;
uint16 clutEntry;
int coloursInPalette = 0;
// Allocate space for the 16 colour destination palette
COLORREF *dstPal = (COLORREF*)calloc(sizeof(COLORREF), MAX_COLOURS);
@ -105,7 +106,15 @@ COLORREF* psxClutToRGBPal(uint8 *srcClut) {
for (int idx = 0; idx < 0x10; idx++) {
clutEntry = READ_LE_UINT16(srcClut); // Read PSX CLUT entry
srcClut += sizeof(uint16);
if ((clutEntry == 0) && (coloursInPalette == 0))
coloursInPalette++;
else if ((clutEntry == 0) && (coloursInPalette != 0)) {
*colours = coloursInPalette;
return dstPal;
} else
coloursInPalette++;
// Extract color data
red = ((clutEntry & 0x1F) * 255) / 31;
green = (((clutEntry & 0x3E0) >> 5) * 255) / 31;
@ -115,6 +124,7 @@ COLORREF* psxClutToRGBPal(uint8 *srcClut) {
dstPal[idx] = TINSEL_RGB(red, green, blue);
}
*colours = coloursInPalette;
return dstPal;
}