[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.27,1.28

[Pawel Kolodziejski]

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

Modified Files:
	dimuse.cpp 
Log Message:
fix - stop played song when new
hack - for completable comi song scene

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- dimuse.cpp	12 Jan 2004 19:32:44 -0000	1.27
+++ dimuse.cpp	14 Jan 2004 16:46:19 -0000	1.28
@@ -296,8 +296,10 @@
 				_vm->_mixer->playInputStream(&_track[l].handle, _track[l].stream, true, _track[l].vol / 1000, _track[l].pan, -1);
 			}
 
-			if ((_track[l].soundGroup == IMUSE_MUSIC) && (_vm->_gameId != GID_FT))
+			if ((_track[l].soundGroup == IMUSE_MUSIC) && (_vm->_gameId != GID_FT)) {
+				stopMusic();
 				_curMusicSoundId = soundId;
+			}
 
 			_track[l].locked = false;
 			_track[l].used = true;
@@ -636,7 +638,10 @@
 
 int32 IMuseDigital::getCurMusicPosInMs() {
 	debug(5, "IMuseDigital::getCurMusicPosInMs(%d)", _curMusicSoundId);
-	return getPosInMs(_curMusicSoundId);
+
+//	return getPosInMs(_curMusicSoundId);
+//  hack for comi song scene to be completable
+	return 300000;
 }
 
 int32 IMuseDigital::getCurVoiceLipSyncWidth() {