[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.549,2.550
James Brown
ender at users.sourceforge.net
Thu Jan 15 23:59:00 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv475/scumm
Modified Files:
scummvm.cpp
Log Message:
Fix bug #815853 - Cannot load during intro SMUSH movies
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.549
retrieving revision 2.550
diff -u -d -r2.549 -r2.550
--- scummvm.cpp 16 Jan 2004 07:33:23 -0000 2.549
+++ scummvm.cpp 16 Jan 2004 07:58:55 -0000 2.550
@@ -996,8 +996,9 @@
runScript(9, 0, 0, args);
else
runScript(1, 0, 0, args);
+ } else {
+ _saveLoadFlag = 0;
}
- _saveLoadFlag = 0;
}
void ScummEngine::scummInit() {
@@ -1428,6 +1429,7 @@
}
if (success && _saveLoadFlag != 1)
clearClickedStatus();
+
_saveLoadFlag = 0;
_lastSaveTime = _system->get_msecs();
}
More information about the Scummvm-git-logs
mailing list