[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.88,1.89 kyra.h,1.46,1.47

[Johannes Schickel]

Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24671

Modified Files:
	kyra.cpp kyra.h 
Log Message:
Implemented more of sceneScreenInit and completed transcendScenes.


Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- kyra.cpp	13 Dec 2005 15:10:19 -0000	1.88
+++ kyra.cpp	13 Dec 2005 16:56:33 -0000	1.89
@@ -367,6 +367,10 @@
 	_lastProcessedItemHeight = 16;
 	
 	_hidPage = _screenPage = 0;
+	
+	_unkScreenVar1 = 1;
+	_unkScreenVar2 = 0;
+	_unkScreenVar3 = 0;
 
 	return 0;
 }
@@ -1346,15 +1350,15 @@
 		_res->unloadPakFile(file);
 	}
 	_roomTable[roomIndex].nameIndex = roomName;
-	// _game_unkScreenVar2 = 1;
-	// _game_unkScreenVar3 = 1;
-	// _game_unkScreenVar1 = 0;
+	_unkScreenVar2 = 1;
+	_unkScreenVar3 = 1;
+	_unkScreenVar1 = 0;
 	_brandonPosX = _currentCharacter->x1;
 	_brandonPosY = _currentCharacter->y1;
 	enterNewScene(roomIndex, _currentCharacter->facing, 0, 0, 0);
-	// _game_unkScreenVar1 = 1;
-	// _game_unkScreenVar2 = 0;
-	// _game_unkScreenVar3 = 0;
+	_unkScreenVar1 = 1;
+	_unkScreenVar2 = 0;
+	_unkScreenVar3 = 0;
 }
 
 void KyraEngine::moveCharacterToPos(int character, int facing, int xpos, int ypos) {
@@ -1623,11 +1627,8 @@
 	_sprites->loadSceneShapes();
 	_exitListPtr = 0;
 
-	_screen->fillRect(7, 7, 312, 136, 0, 0);
 	_screen->setScreenPalette(_screen->_currentPalette);
-	_screen->copyRegion(7, 7, 7, 7, 305, 129, 3, 0);
-	_screen->updateScreen();
-
+	
 	_scaleMode = 1;	
 	for (int i = 0; i < 145; ++i) {
 		_scaleTable[i] = 256;
@@ -2044,8 +2045,12 @@
 
 void KyraEngine::initSceneScreen(int brandonAlive) {
 	// XXX (Pointless?) Palette stuff
-	//_screen->shuffleScreen(8, 8, 0x130, 0x80, 2, 0, byte_2EE1C);
-	_screen->copyRegion(1, 8, 1, 8, 304, 0x80, 2, 0);
+	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 (!_scriptInterpreter->startScript(_scriptClick, 2))

Index: kyra.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- kyra.h	13 Dec 2005 15:10:19 -0000	1.46
+++ kyra.h	13 Dec 2005 16:56:33 -0000	1.47
@@ -580,6 +580,7 @@
 	int _mouseState;
 	bool _handleInput;
 	bool _updateScreen;
+	int _unkScreenVar1, _unkScreenVar2, _unkScreenVar3;
 
 	WSAMovieV1 *_wsaObjects[10];
 	uint16 _entranceMouseCursorTracks[8];