changed lipsync func param

svn-id: r12210

3 files changed, 9 insertions, 7 deletions

diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index c7e8bd07d5..c9787b85e6 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -181,6 +181,8 @@ void IMuseDigital::callback() {
 							break;
 					}
 					mixer_size -= result;
+//					if (mixer_size < 0)
+//						mixer_size = 0;
 					assert(mixer_size >= 0);
 				} while (mixer_size != 0);
 			}
@@ -570,7 +572,6 @@ void IMuseDigital::closeBundleFiles() {
 }
 
 int32 IMuseDigital::getPosInMs(int soundId) {
-	debug(5, "IMuseDigital::getPosInMs(%d)", soundId);
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
 		if ((_track[l].idSound == soundId) && _track[l].used) {
 			int32 pos = 1000 * _track[l].trackOffset / _track[l].iteration;
@@ -582,6 +583,7 @@ int32 IMuseDigital::getPosInMs(int soundId) {
 }
 
 int32 IMuseDigital::getCurMusicPosInMs() {
+	debug(5, "IMuseDigital::getCurMusicPosInMs(%d)", _curMusicId);
 	return getPosInMs(_curMusicId);
 }
 
@@ -595,12 +597,12 @@ int32 IMuseDigital::getCurVoiceLipSyncHeight() {
 	return _scumm->_rnd.getRandomNumber(255);
 }
 
-int32 IMuseDigital::getCurMusicLipSyncWidth() {
+int32 IMuseDigital::getCurMusicLipSyncWidth(int32 param) {
 //	int32 pos = getPosInMs(_curMusicId);
 	return _scumm->_rnd.getRandomNumber(255);
 }
 
-int32 IMuseDigital::getCurMusicLipSyncHeight() {
+int32 IMuseDigital::getCurMusicLipSyncHeight(int32 param) {
 //	int32 pos = getPosInMs(_curMusicId);
 	return _scumm->_rnd.getRandomNumber(255);
 }
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h
index 660545b352..ffb9a6704f 100644
--- a/scumm/imuse_digi/dimuse.h
+++ b/scumm/imuse_digi/dimuse.h
@@ -109,8 +109,8 @@ public:
 	int32 getCurMusicPosInMs();
 	int32 getCurVoiceLipSyncWidth();
 	int32 getCurVoiceLipSyncHeight();
-	int32 getCurMusicLipSyncWidth();
-	int32 getCurMusicLipSyncHeight();
+	int32 getCurMusicLipSyncWidth(int32 param);
+	int32 getCurMusicLipSyncHeight(int32 param);
 
 	void closeBundleFiles();
 };
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index d7c3b1925d..2d6ffc9ab0 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1481,10 +1481,10 @@ void ScummEngine_v8::o8_kernelGetFunctions() {
 		push(_imuseDigital->getCurMusicPosInMs());
 		break;
 	case 0xE2:		// musicLipSyncWidth
-		push(_imuseDigital->getCurMusicLipSyncWidth());
+		push(_imuseDigital->getCurMusicLipSyncWidth(args[1]));
 		break;
 	case 0xE3:		// musicLipSyncHeight
-		push(_imuseDigital->getCurMusicLipSyncHeight());
+		push(_imuseDigital->getCurMusicLipSyncHeight(args[1]));
 		break;
 	default:
 		error("o8_kernelGetFunctions: default case 0x%x (len = %d)", args[0], len);