libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: Fix recent commit to compile under all circumstances

Browse Source
This commit is contained in:
Adrian Frühwirth 2018-06-06 20:50:55 +02:00
parent 5848c1f873
commit 48db9f04ea
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/scumm/sound.cpp
View File

@ -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;
}