diff options
| -rw-r--r-- | engines/hopkins/script.cpp | 2 | ||||
| -rw-r--r-- | engines/hopkins/sound.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index c133b3e9d8..09555bd236 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -142,7 +142,7 @@ int ScriptManager::handleOpcode(byte *dataP) { } if (!_vm->_soundManager._voiceOffFl) _vm->_soundManager.mixVoice(mesgId, 4, displayedTxtFl); - } else { // if (TRAVAILOBJET) + } else { // if (_tempObjectFl) if (_vm->_globals._saveData->_data[svField356]) { _vm->_fontManager.initTextBuffers(9, 635, _vm->_globals._textFilename, 55, 20, dataP[8], 35, 253); bool displayedTxtFl = false; diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp index b6322b49c0..4df2a2d7d8 100644 --- a/engines/hopkins/sound.cpp +++ b/engines/hopkins/sound.cpp @@ -579,7 +579,6 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { oldMusicVol = _musicVolume; if (!loadVoice(filename, catPos, catLen, _sWav[20])) { - warning("Couldn't load sample: %s", filename.c_str()); _sWav[20]._active = false; } else { _sWav[20]._active = true; @@ -772,7 +771,8 @@ bool SoundManager::loadVoice(const Common::String &filename, size_t fileOffset, if (!f.open(filename)) { // Fallback to APC... if (!f.open(setExtension(filename, ".APC"))) { - warning("Could not open %s for reading", filename.c_str()); + if (!_vm->getIsDemo()) + error("Could not open %s for reading", filename.c_str()); return false; } } |