aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/draw.cpp
diff options
context:
space:
mode:
authorTravis Howell2009-07-22 09:52:44 +0000
committerTravis Howell2009-07-22 09:52:44 +0000
commit227f4a575f8802e05d58eb1dbb8033c64d0af48d (patch)
tree316b2ab304ac0f09f57a61c09099829eeb684414 /engines/agos/draw.cpp
parent64ebb586cdd3ab2f2fb34b51cc89a9f4b8d5cc54 (diff)
downloadscummvm-rg350-227f4a575f8802e05d58eb1dbb8033c64d0af48d.tar.gz
scummvm-rg350-227f4a575f8802e05d58eb1dbb8033c64d0af48d.tar.bz2
scummvm-rg350-227f4a575f8802e05d58eb1dbb8033c64d0af48d.zip
Simplify fade code.
svn-id: r42654
Diffstat (limited to 'engines/agos/draw.cpp')
-rw-r--r--engines/agos/draw.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp
index 45443aa335..368da5db83 100644
--- a/engines/agos/draw.cpp
+++ b/engines/agos/draw.cpp
@@ -871,13 +871,11 @@ void AGOSEngine::slowFadeIn() {
_fastFadeInFlag &= ~0x8000;
_paletteFlag = false;
- memset(_videoBuf1, 0, 1024);
- memcpy(_currentPalette, _displayPalette, 1024);
- memcpy(_videoBuf1 + 1024, _displayPalette, 1024);
+ memset(_currentPalette, 0, sizeof(_currentPalette));
for (c = 255; c >= 0; c -= 4) {
- src = _videoBuf1 + 1024;
- dst = _videoBuf1;
+ src = _displayPalette;
+ dst = _currentPalette;
for (p = _fastFadeInFlag; p !=0 ; p -= 3) {
if (src[0] >= c)
@@ -889,7 +887,7 @@ void AGOSEngine::slowFadeIn() {
src += 4;
dst += 4;
}
- _system->setPalette(_videoBuf1, 0, _fastFadeCount);
+ _system->setPalette(_currentPalette, 0, _fastFadeCount);
delay(5);
}
_fastFadeInFlag = 0;