[Scummvm-git-logs] scummvm master -> 82e20d1cb3d6f3745d1e99f57109ad110d8cba8e

[sev-]

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:
82e20d1cb3 SAGA2: Abort speech by space as in the original. Bug #14047


Commit: 82e20d1cb3d6f3745d1e99f57109ad110d8cba8e
    https://github.com/scummvm/scummvm/commit/82e20d1cb3d6f3745d1e99f57109ad110d8cba8e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-07T17:14:20+01:00

Commit Message:
SAGA2: Abort speech by space as in the original. Bug #14047

The original logic seems to be incorrect

Changed paths:
    engines/saga2/audio.cpp


diff --git a/engines/saga2/audio.cpp b/engines/saga2/audio.cpp
index bae657aca11..fde83d73f00 100644
--- a/engines/saga2/audio.cpp
+++ b/engines/saga2/audio.cpp
@@ -323,12 +323,10 @@ void playLongSound(uint32 s) {
 void playVoice(uint32 s) {
 	debugC(1, kDebugSound, "playVoice(%s)", tag2strP(s));
 
-	if (hResCheckResID(voiceRes, s)) {
-		if (s)
-			g_vm->_audio->queueVoice(s, Here);
-		else
-			g_vm->_audio->stopVoice();
-	}
+	if (s && hResCheckResID(voiceRes, s))
+		g_vm->_audio->queueVoice(s, Here);
+	else
+		g_vm->_audio->stopVoice();
 }
 
 //-----------------------------------------------------------------------