From c590229796237de2176f7a0983c0183df42bd392 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 4 Jun 2006 12:16:12 +0000 Subject: Should fix strange palettes in some rooms. svn-id: r22910 --- engines/kyra/scene.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/engines/kyra/scene.cpp b/engines/kyra/scene.cpp index 972f4e00be..a7e4025fbe 100644 --- a/engines/kyra/scene.cpp +++ b/engines/kyra/scene.cpp @@ -831,14 +831,21 @@ void KyraEngine::initSceneObjectList(int brandonAlive) { } void KyraEngine::initSceneScreen(int brandonAlive) { - // XXX (Pointless?) Palette stuff + // XXX Palette stuff if (_unkScreenVar2 == 1) { _screen->shuffleScreen(8, 8, 304, 128, 2, 0, _unkScreenVar3, false); } else { _screen->copyRegion(8, 8, 8, 8, 304, 128, 2, 0); } _screen->updateScreen(); - // XXX More (pointless?) palette stuff + if (_unkScreenVar1 && _paletteChanged) { + if (!queryGameFlag(0xA0)) { + // XXX Palette stuff + _screen->setScreenPalette(_screen->_currentPalette); + } else { + // XXX Palette stuff + } + } if (!_scriptInterpreter->startScript(_scriptClick, 2)) error("Could not start script function 2 of scene script"); -- cgit v1.2.3