aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMartin Kiewitz2009-12-24 13:20:23 +0000
committerMartin Kiewitz2009-12-24 13:20:23 +0000
commitf5d8bb1d5e0c9e3d559d263bf7f02ca5a447e978 (patch)
tree6819e747722473b613a9304bab4c6192fea603f3 /engines
parent8e3d34c8a007b719efea04a909fcd648f069c112 (diff)
downloadscummvm-rg350-f5d8bb1d5e0c9e3d559d263bf7f02ca5a447e978.tar.gz
scummvm-rg350-f5d8bb1d5e0c9e3d559d263bf7f02ca5a447e978.tar.bz2
scummvm-rg350-f5d8bb1d5e0c9e3d559d263bf7f02ca5a447e978.zip
SCI: new music code / dont filter channel 15 (control) at any time
svn-id: r46526
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/resource.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 33da5a4427..f09bc5e54b 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1942,6 +1942,8 @@ int SoundResource::getChannelFilterMask(int hardwareMask) {
}
data++;
}
+ // Play channel 15 anytime (control channel)
+ channelMask |= 0x8000;
}
return channelMask;
}