[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.717,1.718
kirben
kirben at users.sourceforge.net
Sat Feb 4 15:52:02 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13966/scumm
Modified Files:
scumm.cpp
Log Message:
Fix restarting Maniac NES.
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.717
retrieving revision 1.718
diff -u -d -r1.717 -r1.718
--- scumm.cpp 4 Feb 2006 21:55:37 -0000 1.717
+++ scumm.cpp 4 Feb 2006 23:51:25 -0000 1.718
@@ -2718,15 +2718,23 @@
for (i = 0; i < _numGlobalObjects; i++)
clearOwnerOf(i);
- // Reinit things
- allocateArrays(); // Reallocate arrays
- readIndexFile(); // Reread index (reset objectstate etc)
- scummInit(); // Reinit scumm variables
+ // Reallocate arrays
+ allocateArrays();
+
+ // Reread index (reset objectstate etc)
+ readIndexFile();
+
+ // Reinit scumm variables
+ scummInit();
initScummVars();
+
if (_imuse) {
_imuse->setBase(res.address[rtSound]);
}
- _sound->setupSound(); // Reinit sound engine
+
+ // Reinit sound engine
+ if (_version >= 5)
+ _sound->setupSound();
// Re-run bootscript
int args[16];
More information about the Scummvm-git-logs
mailing list