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

orgads noreply at scummvm.org
Tue Jan 21 21:01:04 UTC 2025


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:
b6ef265b20 SCUMM: Simplify condition a bit


Commit: b6ef265b207810e7680b1461ab2988d20377fba0
    https://github.com/scummvm/scummvm/commit/b6ef265b207810e7680b1461ab2988d20377fba0
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2025-01-21T23:00:47+02:00

Commit Message:
SCUMM: Simplify condition a bit

Changed paths:
    engines/scumm/sound.cpp


diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index f5348d00f62..255ae5bca61 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -421,7 +421,7 @@ void Sound::processSfxQueues() {
 #endif
 		}
 
-		if ((!ConfMan.getBool("subtitles") && finished) || (finished && _vm->_talkDelay == 0)) {
+		if (finished && (!ConfMan.getBool("subtitles") || _vm->_talkDelay == 0)) {
 			if (!(_vm->_game.version == 8 && _vm->VAR(_vm->VAR_HAVE_MSG) == 0))
 				_vm->stopTalk();
 		}




More information about the Scummvm-git-logs mailing list