[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.93,1.94 saveload.cpp,1.25,1.26

[Jamieson Christian]

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

Modified Files:
	imuse.cpp saveload.cpp 
Log Message:
Fixed music overlaps when running ScummVM with the -x option

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- imuse.cpp	7 Dec 2002 17:10:18 -0000	1.93
+++ imuse.cpp	7 Dec 2002 18:03:10 -0000	1.94
@@ -3255,9 +3255,6 @@
 		MKEND()
 	};
 
-	if (!ser->isSaving()) {
-		stop_all_sounds();
-	}
 #ifdef _WIN32_WCE								// Don't break savegames made with andys' build
 	if (!ser->isSaving() && ser->checkEOFLoadStream())
 		return 0;
@@ -3279,6 +3276,7 @@
 		_active_volume_faders = true;
 		fix_parts_after_load();
 		_driver->update_pris();
+		set_master_volume (_master_volume);
 	}
 
 	return 0;

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- saveload.cpp	4 Dec 2002 22:31:26 -0000	1.25
+++ saveload.cpp	7 Dec 2002 18:03:10 -0000	1.26
@@ -631,11 +631,14 @@
 	int var120Backup;
 	int var98Backup;
 
-	if (_mixer && !s->isSaving()) {
-		if (_imuseDigital) {
-			_imuseDigital->stopAll();
-		} else {
-			_mixer->stopAll();
+	if (!s->isSaving()) {
+		_sound->stopAllSounds();
+		if (_mixer) {
+			if (_imuseDigital) {
+				_imuseDigital->stopAll();
+			} else {
+				_mixer->stopAll();
+			}
 		}
 	}