diff options
| -rw-r--r-- | engines/scumm/debugger.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/resource.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp index 617c2ab85f..4dff43c6c3 100644 --- a/engines/scumm/debugger.cpp +++ b/engines/scumm/debugger.cpp @@ -145,8 +145,8 @@ bool ScummDebugger::Cmd_IMuse(int argc, const char **argv) { debugPrintf("Selecting from %d songs...\n", _vm->_numSounds); sound = _vm->_rnd.getRandomNumber(_vm->_numSounds); } - _vm->ensureResourceLoaded(rtSound, sound); - _vm->_musicEngine->startSound(sound); + if (_vm->getResourceAddress(rtSound, sound)) + _vm->_musicEngine->startSound(sound); debugPrintf("Attempted to start music %d.\n", sound); } else { diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp index 5456ae4f8f..e13bb8f3df 100644 --- a/engines/scumm/resource.cpp +++ b/engines/scumm/resource.cpp @@ -887,7 +887,7 @@ void ResourceManager::setHeapThreshold(int min, int max) { bool ResourceManager::validateResource(const char *str, ResType type, ResId idx) const { if (type < rtFirst || type > rtLast || (uint)idx >= (uint)_types[type].size()) { - error("%s Illegal Glob type %s (%d) num %d", str, nameOfResType(type), type, idx); + warning("%s Illegal Glob type %s (%d) num %d", str, nameOfResType(type), type, idx); return false; } return true; diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 8099dd250a..b9b7e28059 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -1321,8 +1321,9 @@ int ScummEngine::readSoundResource(ResId idx) { //dumpResource("sound-", idx, ptr); return 1; } - error("Unrecognized base tag 0x%08x in sound %d", basetag, idx); } + + warning("Unrecognized base tag 0x%08x in sound %d", basetag, idx); _res->_types[rtSound][idx]._roomoffs = RES_INVALID_OFFSET; return 0; } |