[Scummvm-cvs-logs] SF.net SVN: scummvm: [31153] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31153
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31153&view=rev
Author:   lordhoto
Date:     2008-03-17 05:43:09 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
Fixed KyraEngine_v2::initSceneScreen

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.cpp
    scummvm/trunk/engines/kyra/scene_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-17 01:34:24 UTC (rev 31152)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-17 12:43:09 UTC (rev 31153)
@@ -63,7 +63,7 @@
 	_drawNoShapeFlag = false;
 	_charPalEntry = 0;
 	_itemInHand = -1;
-	_unkSceneScreenFlag1 = true;
+	_unkSceneScreenFlag1 = false;
 	_noScriptEnter = true;
 	_currentChapter = 0;
 	_newChapterFile = 1;

Modified: scummvm/trunk/engines/kyra/scene_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v2.cpp	2008-03-17 01:34:24 UTC (rev 31152)
+++ scummvm/trunk/engines/kyra/scene_v2.cpp	2008-03-17 12:43:09 UTC (rev 31153)
@@ -665,7 +665,7 @@
 }
 
 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 @@
 
 	_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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.