Fixed KyraEngine_v2::initSceneScreen

svn-id: r31153

2 files changed, 4 insertions, 14 deletions

diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index e4ffe2feb0..b0e3c2ae04 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -63,7 +63,7 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags) : KyraEngi
 	_drawNoShapeFlag = false;
 	_charPalEntry = 0;
 	_itemInHand = -1;
-	_unkSceneScreenFlag1 = true;
+	_unkSceneScreenFlag1 = false;
 	_noScriptEnter = true;
 	_currentChapter = 0;
 	_newChapterFile = 1;
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);