[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.140.2.6,1.140.2.7

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	saveload.cpp 
Log Message:

Revert small part of scumm/saveload.cpp revision 1.129.
Fixes bug #884171 - DOTT: Transition effect glitch (regression)


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.140.2.6
retrieving revision 1.140.2.7
diff -u -d -r1.140.2.6 -r1.140.2.7
--- saveload.cpp	1 Jul 2004 06:12:47 -0000	1.140.2.6
+++ saveload.cpp	18 Jul 2004 05:09:33 -0000	1.140.2.7
@@ -93,6 +93,7 @@
 	SaveFile *in;
 	int i, j;
 	SaveGameHeader hdr;
+	int sb, sh;
 	byte *roomptr;
 
 	makeSavegameName(filename, slot, compat);
@@ -256,13 +257,18 @@
 		camera._last.x = camera._cur.x;
 	}
 
+	sb = _screenB;
+	sh = _screenH;
+
 	// Restore the virtual screens and force a fade to black.
-	initScreens(_screenB, _screenH);
+	initScreens(kMainVirtScreen, _screenHeight);
 	VirtScreen *vs = &virtscr[0];
 	memset(vs->screenPtr + vs->xstart, 0, vs->width * vs->height);
 	vs->setDirtyRange(0, vs->height);
 	updateDirtyScreen(kMainVirtScreen);
 	updatePalette();
+	initScreens(sb, sh);
+
 	_completeScreenRedraw = true;
 
 	// Reset charset mask