diff options
| author | athrxx | 2019-04-01 00:55:17 +0200 |
|---|---|---|
| committer | athrxx | 2019-04-13 18:55:02 +0200 |
| commit | 0ea6650837cce3007f0820acd17518f9809fd4a7 (patch) | |
| tree | 507986e06df0d230cc2d1ee64b47efb87546b4e7 /engines/kyra/sound/sound_intern.h | |
| parent | 972f4e201ade5660723f6348480437e2a02fa6de (diff) | |
| download | scummvm-rg350-0ea6650837cce3007f0820acd17518f9809fd4a7.tar.gz scummvm-rg350-0ea6650837cce3007f0820acd17518f9809fd4a7.tar.bz2 scummvm-rg350-0ea6650837cce3007f0820acd17518f9809fd4a7.zip | |
KYRA: (EOB2/Amiga) - implement proper sound file loading
(also fix some sound related bugs)
Diffstat (limited to 'engines/kyra/sound/sound_intern.h')
| -rw-r--r-- | engines/kyra/sound/sound_intern.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/kyra/sound/sound_intern.h b/engines/kyra/sound/sound_intern.h index fbf19d742e..57afb26ab5 100644 --- a/engines/kyra/sound/sound_intern.h +++ b/engines/kyra/sound/sound_intern.h @@ -417,8 +417,9 @@ public: void initAudioResourceInfo(int set, void *info); void selectAudioResourceSet(int set); bool hasSoundFile(uint file) const { return false; } - void loadSoundFile(uint file); + void loadSoundFile(uint) {} void loadSoundFile(Common::String file); + void unloadSoundFile(Common::String file); void playTrack(uint8 track); void haltTrack(); void playSoundEffect(uint8 track, uint8 volume = 0xFF); @@ -428,8 +429,6 @@ public: int checkTrigger(); private: - void unloadLevelSounds(); - uint8 *_fileBuffer; KyraEngine_v1 *_vm; @@ -438,10 +437,6 @@ private: Common::String _lastSound; int _currentResourceSet; - int _currentFile; - - const char *const *_levelSoundList1; - const char *const *_levelSoundList2; bool _ready; }; |