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

SWORD2: Adapt to setPalette/grabPalette RGBA->RGB change.

Browse source 
Thanks to eriktorbjorn for helping me with this.
This commit is contained in:
Johannes Schickel 2011-02-15 22:52:15 +01:00
parent 3b9da7f03b
commit 74e4b5a6cd
10 changed files with 79 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engines/sword2/sprite.cpp
View file

@ -747,9 +747,9 @@ int32 Screen::drawSprite(SpriteInfo *s) {
for (i = 0; i < rs.height(); i++) {
for (j = 0; j < rs.width(); j++) {
if (src[j] && lightMap[j]) {
uint8 r = ((32 - lightMap[j]) * _palette[src[j] * 4 + 0]) >> 5;
uint8 g = ((32 - lightMap[j]) * _palette[src[j] * 4 + 1]) >> 5;
uint8 b = ((32 - lightMap[j]) * _palette[src[j] * 4 + 2]) >> 5;
uint8 r = ((32 - lightMap[j]) * _palette[src[j] * 3 + 0]) >> 5;
uint8 g = ((32 - lightMap[j]) * _palette[src[j] * 3 + 1]) >> 5;
uint8 b = ((32 - lightMap[j]) * _palette[src[j] * 3 + 2]) >> 5;
src[j] = quickMatch(r, g, b);
}
}
@ -787,12 +787,12 @@ int32 Screen::drawSprite(SpriteInfo *s) {
for (i = 0; i < rs.height(); i++) {
for (j = 0; j < rs.width(); j++) {
if (src[j]) {
uint8 r1 = _palette[src[j] * 4 + 0];
uint8 g1 = _palette[src[j] * 4 + 1];
uint8 b1 = _palette[src[j] * 4 + 2];
uint8 r2 = _palette[dst[j] * 4 + 0];
uint8 g2 = _palette[dst[j] * 4 + 1];
uint8 b2 = _palette[dst[j] * 4 + 2];
uint8 r1 = _palette[src[j] * 3 + 0];
uint8 g1 = _palette[src[j] * 3 + 1];
uint8 b1 = _palette[src[j] * 3 + 2];
uint8 r2 = _palette[dst[j] * 3 + 0];
uint8 g2 = _palette[dst[j] * 3 + 1];
uint8 b2 = _palette[dst[j] * 3 + 2];
uint8 r = (r1 * n + r2 * (8 - n)) >> 3;
uint8 g = (g1 * n + g2 * (8 - n)) >> 3;