From ee3c5122773aa6c14fbfefd160825a5b23af6cdb Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Wed, 14 Jan 2004 16:46:19 +0000
Subject: fix - stop played song when new hack - for completable comi song
 scene

svn-id: r12390
---
 scumm/imuse_digi/dimuse.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'scumm/imuse_digi')

diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index f0bb0b4049..b43c26b08d 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -296,8 +296,10 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType,
 				_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::getPosInMs(int soundId) {
 
 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() {
-- 
cgit v1.2.3