aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/scene_v2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/kyra/scene_v2.cpp')
-rw-r--r--engines/kyra/scene_v2.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp
index 46c3fc1c93..e3a563eb68 100644
--- a/engines/kyra/scene_v2.cpp
+++ b/engines/kyra/scene_v2.cpp
@@ -665,7 +665,7 @@ void KyraEngine_v2::initSceneAnims(int unk1) {
}
void KyraEngine_v2::initSceneScreen(int unk1) {
- /*if (_unkSceneScreenFlag1) {
+ if (_unkSceneScreenFlag1) {
_screen->copyRegion(0, 0, 0, 0, 320, 144, 2, 0);
return;
}
@@ -677,19 +677,9 @@ void KyraEngine_v2::initSceneScreen(int unk1) {
_screen->copyRegion(0, 0, 0, 0, 320, 144, 2, 0);
- if (_noScriptEnter)
- memcpy(_screen->getPalette(0), _screen->getPalette(1), 384);*/
-
- if (_unkSceneScreenFlag1 || _noScriptEnter) {
- memset(_screen->getPalette(0), 0, 384);
- _screen->setScreenPalette(_screen->getPalette(0));
- }
-
- _screen->copyRegion(0, 0, 0, 0, 320, 144, 2, 0);
-
- if (_unkSceneScreenFlag1 || _noScriptEnter) {
+ if (_noScriptEnter) {
+ _screen->setScreenPalette(_screen->getPalette(1));
memcpy(_screen->getPalette(0), _screen->getPalette(1), 384);
- _screen->setScreenPalette(_screen->getPalette(0));
}
updateCharPal(0);