[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.138,1.139

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28347/scumm

Modified Files:
	saveload.cpp 
Log Message:
Patch #886058 - Don't stop music when loading certain temporary states.


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- saveload.cpp	15 Jan 2004 19:25:17 -0000	1.138
+++ saveload.cpp	31 Jan 2004 16:07:11 -0000	1.139
@@ -124,7 +124,21 @@
 
 	memcpy(_saveLoadName, hdr.name, sizeof(hdr.name));
 
-	_sound->stopAllSounds();
+	// Unless specifically requested with _saveSound, we do not save the iMUSE
+	// state for temporary state saves - such as certain cutscenes in DOTT,
+	// FOA, Sam and Max, etc.
+	//
+	// Thusly, we should probably not stop music when restoring from one of 
+	// these saves. This change stops the Mole Man theme from going quiet in
+	// Sam & Max when Doug tells you about the Ball of Twine, as mentioned in
+	// patch #886058.
+	//
+	// If we don't have iMUSE at all we may as well stop the sounds. The previous
+	// default behavior here was to stopAllSounds on all state restores.
+
+	if (!_imuse || _saveSound || !_saveLoadCompatible)
+		_sound->stopAllSounds();
+
 	_sound->stopCD();
 
 	_sound->pauseSounds(true);