[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.26,1.27 dimuse_music.cpp,1.1,1.2

Pawel Kolodziejski aquadran at users.sourceforge.net
Mon Jan 12 11:33:04 CET 2004


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

Modified Files:
	dimuse.cpp dimuse_music.cpp 
Log Message:
- fix - proper place for stopallsound
- fix - correct fade value

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dimuse.cpp	12 Jan 2004 19:15:07 -0000	1.26
+++ dimuse.cpp	12 Jan 2004 19:32:44 -0000	1.27
@@ -54,8 +54,8 @@
 }
 
 IMuseDigital::~IMuseDigital() {
-	_vm->_timer->removeTimerProc(timer_handler);
 	stopAllSounds(true);
+	_vm->_timer->removeTimerProc(timer_handler);
 	delete _sound;
 }
 

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dimuse_music.cpp	12 Jan 2004 19:15:07 -0000	1.1
+++ dimuse_music.cpp	12 Jan 2004 19:32:44 -0000	1.2
@@ -109,7 +109,7 @@
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
 		_track[l].locked = true;
 		if (_track[l].used) {
-			parseScriptCmds(14, _track[l].soundId, 0x600, 0, 0x200, 0, 0, 0);
+			parseScriptCmds(14, _track[l].soundId, 0x600, 0, 200, 0, 0, 0);
 		}
 		_track[l].locked = false;
 	}





More information about the Scummvm-git-logs mailing list