diff options
| author | Fabio Battaglia | 2009-06-03 14:03:05 +0000 |
|---|---|---|
| committer | Fabio Battaglia | 2009-06-03 14:03:05 +0000 |
| commit | dcbc6e7e695dcf35a36fc436c9318fd2648b1099 (patch) | |
| tree | 212e5cad99d58b7f3b400c80c20c50fe531469ea /engines/tinsel/palette.cpp | |
| parent | cb0aed33037a67c3570059df98ec7bbd167d1703 (diff) | |
| download | scummvm-rg350-dcbc6e7e695dcf35a36fc436c9318fd2648b1099.tar.gz scummvm-rg350-dcbc6e7e695dcf35a36fc436c9318fd2648b1099.tar.bz2 scummvm-rg350-dcbc6e7e695dcf35a36fc436c9318fd2648b1099.zip | |
tinsel: removed some warnings related to psx code and cleanup of psx palette remapper function
svn-id: r41138
Diffstat (limited to 'engines/tinsel/palette.cpp')
| -rw-r--r-- | engines/tinsel/palette.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp index 17449f518e..1a384ea6c5 100644 --- a/engines/tinsel/palette.cpp +++ b/engines/tinsel/palette.cpp @@ -112,9 +112,7 @@ void psxPaletteMapper(PALQ *originalPal, uint8 *psxClut, byte *mapperTable) { // Check for correspondent color for (int i = 0; (i < pal->numColours) && !colorFound; i++) { // get R G B values in the same way as psx format converters - uint16 psxEquivalent = (uint16)((uint32)(PSXGetRValue(pal->palRGB[i]) >> 3) | - ((PSXGetGValue(pal->palRGB[i]) >> 3) << 5) | - ((PSXGetBValue(pal->palRGB[i]) >> 3) << 10)); + uint16 psxEquivalent = TINSEL_PSX_RGB(TINSEL_GetRValue(pal->palRGB[i]) >> 3, TINSEL_GetGValue(pal->palRGB[i]) >> 3, TINSEL_GetBValue(pal->palRGB[i]) >> 3); if (psxEquivalent == clutEntry) { mapperTable[j] = i + 1; |