diff options
author | Johannes Schickel | 2011-02-15 23:22:30 +0100 |
---|---|---|
committer | Johannes Schickel | 2011-02-15 23:22:30 +0100 |
commit | 2b62f6bec3639ab816f6f841218d4b19f70b201e (patch) | |
tree | 5b59c5e06a506ca45af266fd945b035a012ebe61 /engines/agos/draw.cpp | |
parent | 2078024ee41b83f87732d9d4cdceadaba8c79609 (diff) | |
download | scummvm-rg350-2b62f6bec3639ab816f6f841218d4b19f70b201e.tar.gz scummvm-rg350-2b62f6bec3639ab816f6f841218d4b19f70b201e.tar.bz2 scummvm-rg350-2b62f6bec3639ab816f6f841218d4b19f70b201e.zip |
AGOS: Adapt to setPalette RGBA->RGB change.
I only (minimally) tested this change with Simon 1 + 2 DOS CD.
Diffstat (limited to 'engines/agos/draw.cpp')
-rw-r--r-- | engines/agos/draw.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp index 37abe9324c..317c68d31a 100644 --- a/engines/agos/draw.cpp +++ b/engines/agos/draw.cpp @@ -779,8 +779,8 @@ void AGOSEngine::setMoveRect(uint16 x, uint16 y, uint16 width, uint16 height) { void AGOSEngine::displayScreen() { if (_fastFadeInFlag == 0 && _paletteFlag == 1) { _paletteFlag = 0; - if (memcmp(_displayPalette, _currentPalette, 1024)) { - memcpy(_currentPalette, _displayPalette, 1024); + if (memcmp(_displayPalette, _currentPalette, sizeof(_currentPalette))) { + memcpy(_currentPalette, _displayPalette, sizeof(_displayPalette)); _system->getPaletteManager()->setPalette(_displayPalette, 0, 256); } } @@ -860,7 +860,7 @@ void AGOSEngine::fastFadeIn() { slowFadeIn(); } else { _paletteFlag = false; - memcpy(_currentPalette, _displayPalette, 1024); + memcpy(_currentPalette, _displayPalette, sizeof(_displayPalette)); _system->getPaletteManager()->setPalette(_displayPalette, 0, _fastFadeInFlag); _fastFadeInFlag = 0; } @@ -879,15 +879,15 @@ void AGOSEngine::slowFadeIn() { src = _displayPalette; dst = _currentPalette; - for (p = _fastFadeInFlag; p !=0; p -= 3) { + for (p = _fastFadeInFlag; p != 0; p -= 3) { if (src[0] >= c) dst[0] += 4; if (src[1] >= c) dst[1] += 4; if (src[2] >= c) dst[2] += 4; - src += 4; - dst += 4; + src += 3; + dst += 3; } _system->getPaletteManager()->setPalette(_currentPalette, 0, _fastFadeCount); delay(5); |