aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/sound.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/kyra/sound.h')
-rw-r--r--engines/kyra/sound.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 426d7b6896..919cc3ceab 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -180,6 +180,10 @@ protected:
const void *cdaData() const { return _soundDataList != 0 ? _soundDataList->_cdaTracks : 0; }
const int cdaTrackNum() const { return _soundDataList != 0 ? _soundDataList->_cdaNumTracks : 0; }
+ enum {
+ kNumVocHandles = 4
+ };
+
int _musicEnabled;
bool _sfxEnabled;
@@ -191,7 +195,7 @@ protected:
private:
const AudioDataStruct *_soundDataList;
Audio::AudioStream *_currentVocFile;
- Audio::SoundHandle _vocHandle;
+ Audio::SoundHandle _vocHandles[kNumVocHandles];
struct SpeechCodecs {
const char *fileext;
@@ -425,10 +429,10 @@ private:
int _lastTrack;
Audio::AudioStream *_currentSFX;
- Audio::SoundHandle _sfxHandle;
+ Audio::SoundHandle _sfxHandles[kNumVocHandles];
- //SoundTowns_v2_TwnDriver * _driver;
- uint8 * _twnTrackData;
+ //SoundTowns_v2_TwnDriver *_driver;
+ uint8 *_twnTrackData;
};
class MixedSoundDriver : public Sound {