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

sluicebox 22204938+sluicebox at users.noreply.github.com
Mon Jun 8 02:43:08 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:
f20fd467d3 SCI: Allow channel 9 on all matching audio drivers


Commit: f20fd467d32ae7e5497231ec6650e3a3217504c0
    https://github.com/scummvm/scummvm/commit/f20fd467d32ae7e5497231ec6650e3a3217504c0
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-06-07T19:43:04-07:00

Commit Message:
SCI: Allow channel 9 on all matching audio drivers

Fixes bug #10734

Changed paths:
    engines/sci/resource_audio.cpp


diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 7fcc95220d..5f9ff5d896 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -968,7 +968,7 @@ int SoundResource::getChannelFilterMask(int hardwareMask, bool wantsRhythm) {
 			break;
 		case 9:
 			// Play rhythm channel when requested
-			play = wantsRhythm;
+			play = wantsRhythm || (flags & hardwareMask);
 			break;
 		default:
 			// Otherwise check for flag




More information about the Scummvm-git-logs mailing list