diff options
| author | Johannes Schickel | 2008-01-03 14:42:49 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-01-03 14:42:49 +0000 |
| commit | 58f0d4e632793ac9e38f5c0596626eba1173748d (patch) | |
| tree | 5f02d8697f853a46e2aa2ffb28696f26d2c14439 /engines/kyra/kyra_v2.h | |
| parent | d531d4234730edfb0e6ec095b34f22c1fb66754e (diff) | |
| download | scummvm-rg350-58f0d4e632793ac9e38f5c0596626eba1173748d.tar.gz scummvm-rg350-58f0d4e632793ac9e38f5c0596626eba1173748d.tar.bz2 scummvm-rg350-58f0d4e632793ac9e38f5c0596626eba1173748d.zip | |
Committed slightly modified patch #1862758 "KYRA: audio data assignment patch".
svn-id: r30198
Diffstat (limited to 'engines/kyra/kyra_v2.h')
| -rw-r--r-- | engines/kyra/kyra_v2.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index fa11952087..9bc44d1cde 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -250,10 +250,18 @@ protected: static const char *_dosSoundFileListIntro[]; static const char *_dosSoundFileListFinale[]; - static const char *_dosSoundFileList[]; - static const int _dosSoundFileListSize; + static const char *_dosSoundFileList[]; + static const char *_fmtSoundFileListIntro[]; + static const char *_fmtSoundFileListFinale[]; + static const char *_fmtSoundFileList[]; + static const uint8 _cdaTrackTableIntro[]; + static const uint8 _cdaTrackTableIngame[]; + static const uint8 _cdaTrackTableFinale[]; + static const AudioDataStruct _soundData_PC[]; + static const AudioDataStruct _soundData_TOWNS[]; static const int8 _dosTrackMap[]; static const int _dosTrackMapSize; + const AudioDataStruct * _soundData; protected: // game initialization @@ -630,7 +638,6 @@ protected: virtual void snd_playVoiceFile(int id); void snd_loadSoundFile(int id); - void snd_assignMusicData(kMusicDataID id); void playVoice(int high, int low); @@ -843,6 +850,8 @@ protected: static const char *_sequenceSoundList_PC[]; static const int _sequenceSoundListSize_PC; + static const char *_sequenceSoundList_PCFLOPPY[]; + static const int _sequenceSoundListSize_PCFLOPPY; static const char *_sequenceSoundList_TOWNS[]; static const int _sequenceSoundListSize_TOWNS; static const char *_sequenceStrings_TOWNS_EN[]; |