aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Kagerer2008-02-22 07:00:12 +0000
committerFlorian Kagerer2008-02-22 07:00:12 +0000
commitfaeb81fb62a40ef79355c42934d4126130f350f7 (patch)
tree98b8f2d0f0b11b9db38e6fec573ee3e686837581
parent3969249b939c2c61ad36a7e7ed959c81b1847c68 (diff)
downloadscummvm-rg350-faeb81fb62a40ef79355c42934d4126130f350f7.tar.gz
scummvm-rg350-faeb81fb62a40ef79355c42934d4126130f350f7.tar.bz2
scummvm-rg350-faeb81fb62a40ef79355c42934d4126130f350f7.zip
palette bug fix (inventory turned blue when leaving the scene after eating the mushroom)
svn-id: r30915
-rw-r--r--engines/kyra/script_v2.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp
index 2bb33b333c..c2c0be003c 100644
--- a/engines/kyra/script_v2.cpp
+++ b/engines/kyra/script_v2.cpp
@@ -846,7 +846,9 @@ int KyraEngine_v2::o2_mushroomEffect(ScriptState *script) {
}
snd_playSoundEffect(106);
_screen->fadePalette(_screen->_currentPalette, 90, &_updateFunctor);
- _screen->fadePalette(_screen->getPalette(1), 30, &_updateFunctor);
+
+ memcpy(_screen->_currentPalette, _screen->getPalette(1), 768);
+ _screen->fadePalette(_screen->_currentPalette, 30, &_updateFunctor);
return 0;
}