diff options
| author | Adrian Frühwirth | 2018-06-06 20:50:55 +0200 |
|---|---|---|
| committer | Adrian Frühwirth | 2018-06-06 20:53:14 +0200 |
| commit | 48db9f04eabfc295ecd1606c2244482d9c15150e (patch) | |
| tree | fee54ceca37e0241a8758183ba5ee1a0c8f1bce6 /engines/scumm | |
| parent | 5848c1f873380ee8c3c83086a4e493d432e4d26b (diff) | |
| download | scummvm-rg350-48db9f04eabfc295ecd1606c2244482d9c15150e.tar.gz scummvm-rg350-48db9f04eabfc295ecd1606c2244482d9c15150e.tar.bz2 scummvm-rg350-48db9f04eabfc295ecd1606c2244482d9c15150e.zip | |
SCUMM: Fix recent commit to compile under all circumstances
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/sound.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index b49c694cfd..c90b13cfdc 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -487,9 +487,7 @@ 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 id = -1; -#if defined(USE_FLAC) || defined(USE_VORBIS) || defined(USE_MAD) int size = 0; -#endif Common::ScopedPtr<ScummFile> file; bool _sampleIsPCMS16BE44100 = false; @@ -595,11 +593,6 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle if (mode == 2 && (_vm->_game.id == GID_INDY4) && (_vm->_language == Common::EN_ANY) && offset == 0x76ccbca) { _sampleIsPCMS16BE44100 = true; size = 86016; // size of speech sample - } else { -#if defined(USE_FLAC) || defined(USE_VORBIS) || defined(USE_MAD) - size = -1; -#endif - } offset += 8; } |