[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.146,1.147 scummvm.cpp,2.610,2.611

[Pawel Kolodziejski]

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

Modified Files:
	saveload.cpp scummvm.cpp 
Log Message:
synced local imuse. many bug fixes, and few new bugs :)

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- saveload.cpp	22 Feb 2004 16:15:49 -0000	1.146
+++ saveload.cpp	2 Mar 2004 20:35:47 -0000	1.147
@@ -139,6 +139,12 @@
 	if (!_imuse || _saveSound || !_saveTemporaryState)
 		_sound->stopAllSounds();
 
+	if (_imuseDigital) {
+		_imuseDigital->stopAllSounds();
+		// temporary hack for initial state for imuse music
+		_imuseDigital->resetState();
+	}
+
 	_sound->stopCD();
 
 	_sound->pauseSounds(true);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.610
retrieving revision 2.611
diff -u -d -r2.610 -r2.611
--- scummvm.cpp	2 Mar 2004 13:09:35 -0000	2.610
+++ scummvm.cpp	2 Mar 2004 20:35:47 -0000	2.611
@@ -1560,6 +1560,9 @@
 	}
 
 	_sound->processSoundQues();
+	if ((_imuseDigital) && (_gameId != GID_FT))
+		_imuseDigital->refreshScripts();
+
 	camera._last = camera._cur;
 
 	if (!(++_expire_counter)) {