[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_player.cpp,2.58.2.1,2.58.2.2 sound.cpp,1.479.2.1,1.479.2.2

[kirben]

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

Modified Files:
      Tag: branch-0-8-0
	imuse_player.cpp sound.cpp 
Log Message:

-Allow no speech in HE games.
-Added extra XMIDI control change cases for HE61 games.


Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.58.2.1
retrieving revision 2.58.2.2
diff -u -d -r2.58.2.1 -r2.58.2.2
--- imuse_player.cpp	18 Oct 2005 02:11:21 -0000	2.58.2.1
+++ imuse_player.cpp	20 Oct 2005 14:11:00 -0000	2.58.2.2
@@ -300,8 +300,11 @@
 		case 93: // Chorus Level
 			part->chorusLevel(param2);
 			break;
-		case 116: // Unknown
-			// FIXME: Often used in puttmoon
+		case 116: // XMIDI For Loop. Not supported
+			// Used in the ending sequence of puttputt
+			break;
+		case 117: // XMIDI Next/Break. Not supported
+			// Used in the ending sequence of puttputt
 			break;
 		case 123: // All Notes Off
 			part->allNotesOff();

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.479.2.1
retrieving revision 1.479.2.2
diff -u -d -r1.479.2.1 -r1.479.2.2
--- sound.cpp	18 Oct 2005 02:11:25 -0000	1.479.2.1
+++ sound.cpp	20 Oct 2005 14:11:00 -0000	1.479.2.2
@@ -662,6 +662,9 @@
 	byte *ptr;
 	int32 size;
 
+	if (ConfMan.getBool("speech_mute"))
+		return;
+
 	if (!_sfxFile->isOpen()) {
 		error("startHETalkSound: Speech file is not open");
 		return;