diff options
| author | Johannes Schickel | 2009-06-29 18:49:28 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-29 18:49:28 +0000 |
| commit | 3919bd2aed36cf31ca33da26aac186e76efc7610 (patch) | |
| tree | ae48152c864bc9a5dbe303fe113ff676d3e7f474 /engines | |
| parent | cc0b30370ed19bdcfc4018f8892476e1f7ed45fc (diff) | |
| download | scummvm-rg350-3919bd2aed36cf31ca33da26aac186e76efc7610.tar.gz scummvm-rg350-3919bd2aed36cf31ca33da26aac186e76efc7610.tar.bz2 scummvm-rg350-3919bd2aed36cf31ca33da26aac186e76efc7610.zip | |
Fix palette regression caused by r41949.
svn-id: r41961
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/kyra_mr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index a9f8ac9975..871edd578d 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -899,9 +899,9 @@ void KyraEngine_MR::updateCharPal(int unk1) { for (int i = 144; i < 168; ++i) { for (int j = 0; j < 3; ++j) { uint8 col = dst[i * 3 + j]; - uint8 subCol = src[(i - 144) * 3 + j] + sceneDatPal[j]; - subCol = CLIP<uint8>(subCol, 0, 63); - subCol = (col - subCol) >> 1; + int subCol = src[(i - 144) * 3 + j] + sceneDatPal[j]; + subCol = CLIP(subCol, 0, 63); + subCol = (col - subCol) / 2; dst[i * 3 + j] -= subCol; } } @@ -914,8 +914,8 @@ void KyraEngine_MR::updateCharPal(int unk1) { for (int i = 144; i < 168; ++i) { for (int j = 0; j < 3; ++j) { - uint8 col = dst[i * 3 + j] + sceneDatPal[j]; - dst[i * 3 + j] = CLIP<uint8>(col, 0, 63); + int col = dst[i * 3 + j] + sceneDatPal[j]; + dst[i * 3 + j] = CLIP(col, 0, 63); } } |