[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.338,1.339

Travis Howell kirben at users.sourceforge.net
Fri Jun 25 05:12:05 CEST 2004


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

Modified Files:
	sound.cpp 
Log Message:

Delay only required when using subtitles


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -d -r1.338 -r1.339
--- sound.cpp	23 Jun 2004 09:13:25 -0000	1.338
+++ sound.cpp	25 Jun 2004 12:11:34 -0000	1.339
@@ -476,7 +476,7 @@
 			}
 		}
 
-		if (finished && _vm->_talkDelay == 0) {
+		if ((!ConfMan.getBool("subtitles") && finished) || (finished && _vm->_talkDelay == 0)) {
 			_vm->stopTalk();
 		}
 	}





More information about the Scummvm-git-logs mailing list