aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/sound.h
diff options
context:
space:
mode:
authorFlorian Kagerer2008-02-17 02:06:04 +0000
committerFlorian Kagerer2008-02-17 02:06:04 +0000
commit753536fa61119a20a5e0d0e9b00790593cd5190e (patch)
tree336fe694314c829ff8c5da1c515c27b506eb5b92 /engines/kyra/sound.h
parent9146cf360301f5bd1822a111c9e49b8e8f497211 (diff)
downloadscummvm-rg350-753536fa61119a20a5e0d0e9b00790593cd5190e.tar.gz
scummvm-rg350-753536fa61119a20a5e0d0e9b00790593cd5190e.tar.bz2
scummvm-rg350-753536fa61119a20a5e0d0e9b00790593cd5190e.zip
committing patch 1891492 : dialogue (dlg/tim) support for HoF
- talking to NPCs is now possible. - Zanthia's talks when entering a new scene for the first time now work - using items on Zanthia is now possible. svn-id: r30886
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 {