diff options
Diffstat (limited to 'engines/scumm/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 5e5e8045b5..071805752b 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -30,7 +30,7 @@ #include "scumm/file.h" #include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" -#include "scumm/player_towns.h" +#include "scumm/players/player_towns.h" #include "scumm/resource.h" #include "scumm/scumm.h" #include "scumm/sound.h" @@ -470,8 +470,10 @@ static int compareMP3OffsetTable(const void *a, const void *b) { void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle *handle) { int num = 0, i; - int size = 0; int id = -1; +#if defined(USE_FLAC) || defined(USE_VORBIS) || defined(USE_MAD) + int size = 0; +#endif Common::ScopedPtr<ScummFile> file; if (_vm->_game.id == GID_CMI) { @@ -562,10 +564,14 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle num = result->num_tags; } offset = result->new_offset; +#if defined(USE_FLAC) || defined(USE_VORBIS) || defined(USE_MAD) size = result->compressed_size; +#endif } else { offset += 8; +#if defined(USE_FLAC) || defined(USE_VORBIS) || defined(USE_MAD) size = -1; +#endif } file.reset(new ScummFile()); |