[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,1.37,1.38

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv23050/scumm

Modified Files:
	script_v2.cpp 
Log Message:
Prevent The Dig from overlapping talk sounds


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- script_v2.cpp	20 Oct 2002 05:41:30 -0000	1.37
+++ script_v2.cpp	20 Oct 2002 16:25:43 -0000	1.38
@@ -2549,6 +2549,10 @@
 		}
 		pointer[j] = 0;
 
+		// Stop any talking that's still going on
+		if (_sound->_talkChannel > -1)
+			_mixer->stop(_sound->_talkChannel);		
+
 		_sound->_talkChannel = _sound->playBundleSound(pointer);
 		_messagePtr = (byte*)&transText;
 		setStringVars(0);
@@ -2577,6 +2581,10 @@
 		}
 		pointer[j] = 0;
 
+		// Stop any talking that's still going on
+		if (_sound->_talkChannel > -1)
+			_mixer->stop(_sound->_talkChannel);
+
 		_sound->_talkChannel = _sound->playBundleSound(pointer);
 		_messagePtr = (byte*)&transText;
 		setStringVars(0);
@@ -3191,7 +3199,12 @@
 				}
 				pointer[j] = 0;
 
+				// Stop any talking that's still going on
+				if (_sound->_talkChannel > -1)
+					_mixer->stop(_sound->_talkChannel);
+
 				_sound->_talkChannel = _sound->playBundleSound(pointer);
+				printf("Talkchannel for %s is %d\n", transText, _sound->_talkChannel);
 				_messagePtr = (byte*)&transText;
 
 				switch (m) {