aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource.h
diff options
context:
space:
mode:
authorFilippos Karapetis2010-06-03 22:00:50 +0000
committerFilippos Karapetis2010-06-03 22:00:50 +0000
commitddf7449b00d15c5419c667f9df553053e8dc0cec (patch)
tree61e07a218c34038d7178cf49d8528254faf28db2 /engines/sci/resource.h
parent1973bd5a71fc2847b123e0f1d769220210eceba4 (diff)
downloadscummvm-rg350-ddf7449b00d15c5419c667f9df553053e8dc0cec.tar.gz
scummvm-rg350-ddf7449b00d15c5419c667f9df553053e8dc0cec.tar.bz2
scummvm-rg350-ddf7449b00d15c5419c667f9df553053e8dc0cec.zip
Added code to get which channels are used by a sound. Also, fixed a crash when using Sierra's GM patches, a regression from commit #49391.
svn-id: r49415
Diffstat (limited to 'engines/sci/resource.h')
-rw-r--r--engines/sci/resource.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index f722ca5768..6d9da3c200 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -512,6 +512,7 @@ public:
Track *getDigitalTrack();
int getChannelFilterMask(int hardwareMask, bool wantsRhythm);
byte getInitialVoiceCount(byte channel);
+ bool isChannelUsed(byte channel) { return _usedChannels[channel]; }
private:
SciVersion _soundVersion;
@@ -519,6 +520,7 @@ private:
Track *_tracks;
Resource *_innerResource;
ResourceManager *_resMan;
+ bool _usedChannels[16];
};
} // End of namespace Sci