[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.603.2.41,1.603.2.42
kirben
kirben at users.sourceforge.net
Sat Feb 4 15:52:03 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.717,1.718
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.194,2.195 script_v6.cpp,1.461,1.462 script_v6he.cpp,2.172,2.173 script_v72he.cpp,2.324,2.325 script_v7he.cpp,2.181,2.182 script_v8.cpp,2.301,2.302 script_v80he.cpp,2.132,2.133 script_v90he.cpp,2.297,2.298
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14270/scumm
Modified Files:
Tag: branch-0-8-0
scumm.cpp
Log Message:
Fix restarting Maniac NES.
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.41
retrieving revision 1.603.2.42
diff -u -d -r1.603.2.41 -r1.603.2.42
--- scumm.cpp 26 Jan 2006 18:07:38 -0000 1.603.2.41
+++ scumm.cpp 4 Feb 2006 23:51:41 -0000 1.603.2.42
@@ -2670,15 +2670,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];
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.717,1.718
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.194,2.195 script_v6.cpp,1.461,1.462 script_v6he.cpp,2.172,2.173 script_v72he.cpp,2.324,2.325 script_v7he.cpp,2.181,2.182 script_v8.cpp,2.301,2.302 script_v80he.cpp,2.132,2.133 script_v90he.cpp,2.297,2.298
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list