[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.119,1.120

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv29429

Modified Files:
	saveload.cpp 
Log Message:
don't see why we shouldn't just always call Sound::stopAllSounds just before loading... if anybody knows more, if you observe regressions, please document this in the source code (and/or file bug reports)

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- saveload.cpp	29 Nov 2003 13:59:33 -0000	1.119
+++ saveload.cpp	29 Nov 2003 14:37:47 -0000	1.120
@@ -125,12 +125,10 @@
 
 	memcpy(_saveLoadName, hdr.name, sizeof(hdr.name));
 
-	if (_imuseDigital) {
-		_imuseDigital->stopAllSounds();
-	}
-
+	_sound->stopAllSounds();
 	_sound->stopBundleMusic();
 	_sound->stopCD();
+
 	_sound->pauseSounds(true);
 
 	CHECK_HEAP
@@ -558,10 +556,6 @@
 	int i, j;
 	int var120Backup;
 	int var98Backup;
-
-	if (s->isLoading() && (_saveSound || !_saveLoadCompatible)) {
-		_sound->stopAllSounds();
-	}
 
 	// Because old savegames won't fill the entire gfxUsageBits[] array,
 	// clear it here just to be sure it won't hold any unforseen garbage.