[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.94,1.95 scummvm.cpp,2.285,2.286

[Jamieson Christian]

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

Modified Files:
	saveload.cpp scummvm.cpp 
Log Message:
Fix for Bug [766851] ALL: MIDI fragment repeats after close ups

Adjusted default _saveSound value used by S&M (whose
value is assumed by pre-S&M games). Corrected save/load
music behavior for non-temporary saves. (Until this default
value change, the incorrect behavior would almost never
manifest itself, so existing savegames should be fine.)

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- saveload.cpp	14 Jul 2003 07:26:57 -0000	1.94
+++ saveload.cpp	15 Jul 2003 10:16:45 -0000	1.95
@@ -130,7 +130,7 @@
 
 	/* Nuke all resources */
 	for (i = rtFirst; i <= rtLast; i++)
-		if (i != rtTemp && i != rtBuffer && (i != rtSound || _saveSound))
+		if (i != rtTemp && i != rtBuffer && (i != rtSound || _saveSound || !compat))
 			for (j = 0; j < res.num[i]; j++) {
 				nukeResource(i, j);
 				res.flags[i][j] = 0;
@@ -551,7 +551,7 @@
 	int var120Backup;
 	int var98Backup;
 
-	if (!s->isSaving() && _saveSound) {
+	if (!s->isSaving() && (_saveSound || !_saveLoadCompatible)) {
 		_sound->stopAllSounds();
 		if (_mixer) {
 			if (_imuseDigital) {
@@ -668,7 +668,7 @@
 		}
 	}
 	
-	if (_imuse && _saveSound) {
+	if (_imuse && (_saveSound || !_saveLoadCompatible)) {
 		_imuse->save_or_load(s, this);
 		_imuse->set_master_volume (_sound->_sound_volume_master);
 		_imuse->set_music_volume (_sound->_sound_volume_music);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.285
retrieving revision 2.286
diff -u -d -r2.285 -r2.286
--- scummvm.cpp	14 Jul 2003 17:36:27 -0000	2.285
+++ scummvm.cpp	15 Jul 2003 10:16:45 -0000	2.286
@@ -393,7 +393,7 @@
 	tempMusic = 0;
 	_silentDigitalImuse = 0;
 	_noDigitalSamples = 0;
-	_saveSound = 1;
+	_saveSound = 0;
 	memset(_extraBoxFlags, 0, sizeof(_extraBoxFlags));
 	memset(_scaleSlots, 0, sizeof(_scaleSlots));
 	_charset = NULL;