thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHERLOCK: Fix Rose Tattoo scene loading problems from merge

Browse source
This commit is contained in:
Paul Gilbert 2015-05-23 10:39:47 -04:00
parent b4b6bf63db
commit c8cfca749a
5 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/sherlock/sound.cpp
View file

@ -68,11 +68,16 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
_vm->_res->addToCache("TITLE.SND");
else {
_vm->_res->addToCache("MUSIC.LIB");
_vm->_res->addToCache("SND.SND");
if (IS_ROSE_TATTOO) {
_vm->_res->addToCache("SOUND.LIB");
} else {
_vm->_res->addToCache("SND.SND");
if (!_vm->isDemo()) {
_vm->_res->addToCache("TITLE.SND");
_vm->_res->addToCache("EPILOGUE.SND");
if (!_vm->isDemo()) {
_vm->_res->addToCache("TITLE.SND");
_vm->_res->addToCache("EPILOGUE.SND");
}
}
}
}