[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.41,1.42 mouse.cpp,1.22,1.23

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv18860/sky

Modified Files:
	control.cpp mouse.cpp 
Log Message:
keep virgin logo from flashing up when using -x

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- control.cpp	12 Jul 2003 05:26:23 -0000	1.41
+++ control.cpp	12 Jul 2003 05:52:28 -0000	1.42
@@ -1499,6 +1499,9 @@
 	_savedCharSet = _skyText->giveCurrentCharSet();
 	_skyText->fnSetFont(0);
 
+	_system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
+	_system->update_screen();
+
 	if (SkyState::_systemVars.gameVersion < 331)
 		_skyScreen->setPalette(60509);
 	else
@@ -1517,6 +1520,11 @@
 		memset(_skyScreen->giveCurrent(), 0, GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT);
 		_skyScreen->showScreen(_skyScreen->giveCurrent());
 		_skyScreen->forceRefresh();
+	} else {
+		memset(_screenBuf, 0, FULL_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
+		_system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
+		_system->update_screen();
+		_skyScreen->showScreen(_skyScreen->giveCurrent());
 	}
 	_skyScreen->setPaletteEndian((uint8 *)SkyState::fetchCompact(SkyState::_systemVars.currentPalette));
 	_skyMouse->spriteMouse(_savedMouse, 0, 0);

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mouse.cpp	12 Jul 2003 01:12:00 -0000	1.22
+++ mouse.cpp	12 Jul 2003 05:52:28 -0000	1.23
@@ -82,6 +82,7 @@
 	_skyDisk = skyDisk;
 	_system = system;
 	_mouseB = 0;
+	_currentCursor = 6;
 	
 	_miceData = _skyDisk->loadFile(MICE_FILE, NULL);
 	fixMouseTransparency(_miceData, _skyDisk->_lastLoadedFileSize);