[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.h,1.38,1.39 dimuse_music.cpp,1.27,1.28 dimuse_script.cpp,1.1,1.2

Pawel Kolodziejski aquadran at users.sourceforge.net
Thu Apr 8 22:10:06 CEST 2004


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

Modified Files:
	dimuse.h dimuse_music.cpp dimuse_script.cpp 
Log Message:
refreshScript was wrong used

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- dimuse.h	9 Apr 2004 03:57:18 -0000	1.38
+++ dimuse.h	9 Apr 2004 04:56:18 -0000	1.39
@@ -146,7 +146,6 @@
 	void stopAllSounds(bool waitForStop);
 	void pause(bool pause);
 	void parseScriptCmds(int a, int b, int c, int d, int e, int f, int g, int h);
-	void refreshScripts();
 	int getSoundStatus(int sound) const;
 	int32 getCurMusicPosInMs();
 	int32 getCurVoiceLipSyncWidth();

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- dimuse_music.cpp	9 Apr 2004 04:20:17 -0000	1.27
+++ dimuse_music.cpp	9 Apr 2004 04:56:18 -0000	1.28
@@ -30,20 +30,6 @@
 #define COMI_STATE_OFFSET 3
 #define COMI_SEQ_OFFSET (COMI_STATE_OFFSET + 94)
 
-void IMuseDigital::refreshScripts() {
-	Common::StackLock lock(_mutex, "IMuseDigital::refreshScripts()");
-	bool found = false;
-	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
-		if ((_track[l].used) && (_track[l].volGroupId == IMUSE_VOLGRP_MUSIC) && (!_track[l].volFadeUsed)) {
-			found = true;
-		}
-	}
-
-	if ((!found) && (_curMusicSeq != 0)) {
-		parseScriptCmds(0x2000, 0, 0, 0, 0, 0, 0, 0);
-	}
-}
-
 void IMuseDigital::setDigMusicState(int stateId) {
 	int l, num = -1;
 

Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dimuse_script.cpp	6 Apr 2004 19:46:43 -0000	1.1
+++ dimuse_script.cpp	9 Apr 2004 04:56:18 -0000	1.2
@@ -155,7 +155,7 @@
 //		setGroupMusicVolume(b);
 		break;
 	default:
-		warning("IMuseDigital::doCommand DEFAULT command %d", cmd);
+		error("IMuseDigital::doCommand DEFAULT command %d", cmd);
 	}
 }
 





More information about the Scummvm-git-logs mailing list