aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-07-18 05:04:30 +0000
committerTravis Howell2004-07-18 05:04:30 +0000
commit9563fb9c6eae59e85a8ba2495426c7e3af4d6f7b (patch)
treeebff79171030a710ac400ad25d2445d09513a1d3
parent3aa5d9dd069e294234ec84d106d485f7dd07a330 (diff)
downloadscummvm-rg350-9563fb9c6eae59e85a8ba2495426c7e3af4d6f7b.tar.gz
scummvm-rg350-9563fb9c6eae59e85a8ba2495426c7e3af4d6f7b.tar.bz2
scummvm-rg350-9563fb9c6eae59e85a8ba2495426c7e3af4d6f7b.zip
Revert small part of scumm/saveload.cpp revision 1.129.
Fixes bug #884171 - DOTT: Transition effect glitch (regression) svn-id: r14240
-rw-r--r--scumm/saveload.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 56d40c15bf..7ec94ea22d 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -92,6 +92,7 @@ bool ScummEngine::loadState(int slot, bool compat) {
SaveFile *in;
int i, j;
SaveGameHeader hdr;
+ int sb, sh;
byte *roomptr;
makeSavegameName(filename, slot, compat);
@@ -272,13 +273,18 @@ bool ScummEngine::loadState(int slot, bool compat) {
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