[Scummvm-git-logs] scummvm master -> 48db9f04eabfc295ecd1606c2244482d9c15150e

[bonki]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
48db9f04ea SCUMM: Fix recent commit to compile under all circumstances


Commit: 48db9f04eabfc295ecd1606c2244482d9c15150e
    https://github.com/scummvm/scummvm/commit/48db9f04eabfc295ecd1606c2244482d9c15150e
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-06-06T20:53:14+02:00

Commit Message:
SCUMM: Fix recent commit to compile under all circumstances

Changed paths:
    engines/scumm/sound.cpp


diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index b49c694..c90b13c 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;
 		}