aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/sound.h
diff options
context:
space:
mode:
authorJohannes Schickel2006-06-02 22:57:02 +0000
committerJohannes Schickel2006-06-02 22:57:02 +0000
commit6ac60c9c7bc39f4e1d9f950d67b4e484220ebc9d (patch)
tree40e2845a46ae598892a9e87235533ba06298f2dd /engines/kyra/sound.h
parent50f12fb9aaba758d97a928bfa0ab197016b40cfe (diff)
downloadscummvm-rg350-6ac60c9c7bc39f4e1d9f950d67b4e484220ebc9d.tar.gz
scummvm-rg350-6ac60c9c7bc39f4e1d9f950d67b4e484220ebc9d.tar.bz2
scummvm-rg350-6ac60c9c7bc39f4e1d9f950d67b4e484220ebc9d.zip
Fix for bug # 1497961 ("KYRA1: in-game "Music" option not working").
svn-id: r22844
Diffstat (limited to 'engines/kyra/sound.h')
-rw-r--r--engines/kyra/sound.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 3252bee6d8..a7de851349 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -61,12 +61,20 @@ public:
virtual void beginFadeOut() = 0;
+ void enableMusic(bool enable) { _musicEnabled = enable; }
+ bool musicEnabled() const { return _musicEnabled; }
+ void enableSFX(bool enable) { _sfxEnabled = enable; }
+ bool sfxEnabled() const { return _sfxEnabled; }
+
void voicePlay(const char *file);
void voiceUnload() {}
bool voiceIsPlaying();
void voiceStop();
protected:
+ bool _musicEnabled;
+ bool _sfxEnabled;
+
KyraEngine *_engine;
Audio::Mixer *_mixer;
@@ -105,6 +113,8 @@ public:
void beginFadeOut();
private:
+ void play(uint8 track);
+
void loadSoundFile(const char *file);
void unk1();