libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PARALLACTION: Adapt to setPalette RGBA->RGB change.

Browse Source 
This change is not tested, but should hopefully work fine.
This commit is contained in:
Johannes Schickel 2011-02-13 19:33:22 +01:00
parent 3f8e860a23
commit 51c8871b9b
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/parallaction/graphics.cpp
View File

@ -160,26 +160,24 @@ void Palette::fadeTo(const Palette& target, uint step) {
return;
}
uint Palette::fillRGBA(byte *rgba) {
uint Palette::fillRGB(byte *rgb) {
byte r, g, b;
byte *hbPal = rgba + _colors * 4;
byte *hbPal = rgb + _colors * 4;
for (uint32 i = 0; i < _colors; i++) {
r = (_data[i*3] << 2) | (_data[i*3] >> 4);
g = (_data[i*3+1] << 2) | (_data[i*3+1] >> 4);
b = (_data[i*3+2] << 2) | (_data[i*3+2] >> 4);
rgba[i*4] = r;
rgba[i*4+1] = g;
rgba[i*4+2] = b;
rgba[i*4+3] = 0;
rgb[i*3] = r;
rgb[i*3+1] = g;
rgb[i*3+2] = b;
if (_hb) {
hbPal[i*4] = r >> 1;
hbPal[i*4+1] = g >> 1;
hbPal[i*4+2] = b >> 1;
hbPal[i*4+3] = 0;
hbPal[i*3] = r >> 1;
hbPal[i*3+1] = g >> 1;
hbPal[i*3+2] = b >> 1;
}
}
@ -222,9 +220,9 @@ void Palette::rotate(uint first, uint last, bool forward) {
void Gfx::setPalette(Palette pal) {
byte sysPal[256*4];
byte sysPal[256*3];
uint n = pal.fillRGBA(sysPal);
uint n = pal.fillRGB(sysPal);
_vm->_system->getPaletteManager()->setPalette(sysPal, 0, n);
}

2
engines/parallaction/graphics.h
View File

@ -250,7 +250,7 @@ public:
void setEntry(uint index, int red, int green, int blue);
void makeGrayscale();
void fadeTo(const Palette& target, uint step);
uint fillRGBA(byte *rgba);
uint fillRGB(byte *rgb);
void rotate(uint first, uint last, bool forward);
};