[Scummvm-git-logs] scummvm master -> fe2046af4f87b80eb418705cb5b2e85ec417742b

yuv422 yuv422 at users.noreply.github.com
Sat Aug 29 02:47:52 UTC 2020


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fe2046af4f DRAGONS: Stop background dialog when flicker needs to talk via an action.


Commit: fe2046af4f87b80eb418705cb5b2e85ec417742b
    https://github.com/scummvm/scummvm/commit/fe2046af4f87b80eb418705cb5b2e85ec417742b
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-08-29T12:36:39+10:00

Commit Message:
DRAGONS: Stop background dialog when flicker needs to talk via an action.

Changed paths:
    engines/dragons/sound.cpp


diff --git a/engines/dragons/sound.cpp b/engines/dragons/sound.cpp
index ffa14f042f..e55de24e89 100644
--- a/engines/dragons/sound.cpp
+++ b/engines/dragons/sound.cpp
@@ -78,8 +78,7 @@ void CdIntToPos_0(uint32 param_1) { //, byte *param_2)
 
 void SoundManager::playSpeech(uint32 textIndex) {
 	if (isSpeechPlaying()) {
-//		_vm->_mixer->stopHandle(_speechHandle);
-		return;
+		_vm->_mixer->stopHandle(_speechHandle);
 	}
 
 	// Reduce music volume while playing dialog.




More information about the Scummvm-git-logs mailing list