diff options
author | Johannes Schickel | 2007-02-08 08:39:33 +0000 |
---|---|---|
committer | Johannes Schickel | 2007-02-08 08:39:33 +0000 |
commit | aa38257840579adbef694a454769e4d4a7a85fc6 (patch) | |
tree | 5e80645658bbb392f4658fedd3e31d016e54e470 /engines/kyra/script_v1.cpp | |
parent | 6854f25740df9d460d2c412c78657f9b7058f000 (diff) | |
download | scummvm-rg350-aa38257840579adbef694a454769e4d4a7a85fc6.tar.gz scummvm-rg350-aa38257840579adbef694a454769e4d4a7a85fc6.tar.bz2 scummvm-rg350-aa38257840579adbef694a454769e4d4a7a85fc6.zip |
- fixed crash in FM-Towns version when entering the grotto
- fixed some palette issues
svn-id: r25423
Diffstat (limited to 'engines/kyra/script_v1.cpp')
-rw-r--r-- | engines/kyra/script_v1.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp index ea7dc77651..0551d2aab2 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script_v1.cpp @@ -622,9 +622,7 @@ int KyraEngine::o1_restoreAllObjectBackgrounds(ScriptState *script) { int KyraEngine::o1_setCustomPaletteRange(ScriptState *script) { debugC(3, kDebugLevelScriptFuncs, "o1_setCustomPaletteRange(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); - uint8 *screenPal = _screen->_currentPalette; - memcpy(&screenPal[stackPos(1)*3], _specialPalettes[stackPos(0)], stackPos(2)*3); - _screen->setScreenPalette(screenPal); + memcpy(_screen->getPalette(1) + stackPos(1)*3, _specialPalettes[stackPos(0)], stackPos(2)*3); return 0; } @@ -1265,8 +1263,7 @@ int KyraEngine::o1_setFireberryGlowPalette(ScriptState *script) { } } const uint8 *palette = _specialPalettes[palIndex]; - memcpy(&_screen->_currentPalette[684], palette, 44); - _screen->setScreenPalette(_screen->_currentPalette); + memcpy(_screen->getPalette(1) + 684, palette, 44); return 0; } |