[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.42,1.43

Pawel Kolodziejski aquadran at users.sourceforge.net
Thu Feb 12 22:49:04 CET 2004


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

Modified Files:
	dimuse.cpp 
Log Message:
proper usage actor talkVolume

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- dimuse.cpp	30 Jan 2004 20:49:26 -0000	1.42
+++ dimuse.cpp	13 Feb 2004 06:43:10 -0000	1.43
@@ -282,7 +282,16 @@
 				bits = _sound->getBits(_track[l].soundHandle);
 				channels = _sound->getChannels(_track[l].soundHandle);
 				freq = _sound->getFreq(_track[l].soundHandle);
-				
+
+				if ((soundId == kTalkSoundID) && (soundType == IMUSE_BUNDLE)) {
+					if (_vm->_actorToPrintStrFor != 0xFF && _vm->_actorToPrintStrFor != 0) {
+						Actor *a = _vm->derefActor(_vm->_actorToPrintStrFor, "IMuseDigital::startSound");
+						freq = (freq * a->talkFrequency) / 256;
+						_track[l].pan = a->talkPan;
+						_track[l].vol = a->talkVolume * 1000;
+					}
+				}
+
 				assert(bits == 8 || bits == 12 || bits == 16);
 				assert(channels == 1 || channels == 2);
 				assert(0 < freq && freq <= 65535);





More information about the Scummvm-git-logs mailing list