aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource.h
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2015-02-15 14:16:02 +0100
committerWillem Jan Palenstijn2015-02-15 14:16:02 +0100
commit6dcc8b03b89902020f7a52f4823706bc8376e0b3 (patch)
tree2a1ee497bf0d031bbeb1ac249400046797ef8f9f /engines/sci/resource.h
parent7658821afd7a6d2e70286866c15eff7dd2618115 (diff)
parent2b49b5f95e8d6bd5ea3ab8ffb20ebad2ae7fc95e (diff)
downloadscummvm-rg350-6dcc8b03b89902020f7a52f4823706bc8376e0b3.tar.gz
scummvm-rg350-6dcc8b03b89902020f7a52f4823706bc8376e0b3.tar.bz2
scummvm-rg350-6dcc8b03b89902020f7a52f4823706bc8376e0b3.zip
Merge branch 'sci_audio'
This branch contains a number of improvements to how song priorities are handled. We are now much closer to how SSCI treats priority. It also increases the SCI savegame version from 31 to 33.
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 62f3c584ac..ef48998b04 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -596,6 +596,7 @@ public:
Track *getDigitalTrack();
int getChannelFilterMask(int hardwareMask, bool wantsRhythm);
byte getInitialVoiceCount(byte channel);
+ byte getSoundPriority() const { return _soundPriority; }
private:
SciVersion _soundVersion;
@@ -603,6 +604,7 @@ private:
Track *_tracks;
Resource *_innerResource;
ResourceManager *_resMan;
+ byte _soundPriority;
};
} // End of namespace Sci