diff options
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 2b6f4a7ba7..1d19d4ce5a 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -175,8 +175,8 @@ void Sound::playSound(int soundID, int heOffset, int heChannel, int heFlags) { sprintf(buf, "%s.he4", _vm->getGameName()); - if (_vm->_heMacFileNameIndex > 0) { - _vm->generateMacFileName(buf, buf1, 128, 0, _vm->_heMacFileNameIndex); + if (_vm->_substResFileNameIndex > 0) { + _vm->generateSubstResFileName(buf, buf1, 128, 0, _vm->_substResFileNameIndex); strcpy(buf, buf1); } if (musicFile.open(buf) == false) { @@ -1067,16 +1067,16 @@ ScummFile *Sound::openSfxFile() { if (!file->isOpen()) { if ((_vm->_heversion == 60 && _vm->_features & GF_MACINTOSH) || (_vm->_heversion >= 70)) { sprintf(buf, "%s.he2", _vm->getGameName()); - - if (_vm->_heMacFileNameIndex > 0) { - char buf1[128]; - - _vm->generateMacFileName(buf, buf1, 128, 0, _vm->_heMacFileNameIndex); - strcpy(buf, buf1); - } } else { sprintf(buf, "%s.tlk", _vm->getGameName()); } + + if (_vm->_substResFileNameIndex > 0) { + char buf1[128]; + + _vm->generateSubstResFileName(buf, buf1, 128, 0, _vm->_substResFileNameIndex); + strcpy(buf, buf1); + } if (file->open(buf) && _vm->_heversion <= 72) file->setEnc(0x69); _soundMode = kVOCMode; |