[Scummvm-cvs-logs] SF.net SVN: scummvm:[42548] scummvm/trunk/engines/scumm/imuse_digi/ dimuse_track.cpp

[Kirben at users.sourceforge.net]

Revision: 42548
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42548&view=rev
Author:   Kirben
Date:     2009-07-17 00:25:27 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
Fix bug #2821986 - COMI: setting to 'subtitles only' does not disable speech.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2009-07-17 00:24:56 UTC (rev 42547)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2009-07-17 00:25:27 UTC (rev 42548)
@@ -22,6 +22,7 @@
  * $Id$
  */
 
+#include "common/config-manager.h"
 #include "common/timer.h"
 
 #include "scumm/actor.h"
@@ -136,6 +137,11 @@
 				track->pan = a->_talkPan;
 				track->vol = a->_talkVolume * 1000;
 			}
+
+			// The volume is set to zero, when using subtitles only setting in COMI
+			if (ConfMan.getBool("speech_mute") || _vm->VAR(_vm->VAR_VOICE_MODE) == 2) {
+				track->vol = 0;
+			}
 		}
 
 		assert(bits == 8 || bits == 12 || bits == 16);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.