diff options
| author | Matthew Stewart | 2018-07-27 02:21:56 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | 42b228144ad5f19c412e24a8c98e536908748f95 (patch) | |
| tree | 7b576a0f3b7a774abf814237dde072b35f4546c0 /engines | |
| parent | f412328181baaac3ec6726de3bd9b914731cc551 (diff) | |
| download | scummvm-rg350-42b228144ad5f19c412e24a8c98e536908748f95.tar.gz scummvm-rg350-42b228144ad5f19c412e24a8c98e536908748f95.tar.bz2 scummvm-rg350-42b228144ad5f19c412e24a8c98e536908748f95.zip | |
STARTREK: Allow engine to run without voc files
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/startrek/awaymission.cpp | 2 | ||||
| -rw-r--r-- | engines/startrek/sound.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp index 158d8c6ece..4fb62cd8c3 100644 --- a/engines/startrek/awaymission.cpp +++ b/engines/startrek/awaymission.cpp @@ -495,7 +495,7 @@ SharedPtr<Room> StarTrekEngine::getRoom() { void StarTrekEngine::addAction(const Action &action) { if (action.type != ACTION_TICK) - debug("Action %d: %x, %x, %x", action.type, action.b1, action.b2, action.b3); + debugC(kDebugGeneral, 4, "Action %d: %x, %x, %x", action.type, action.b1, action.b2, action.b3); _actionQueue.push(action); } diff --git a/engines/startrek/sound.cpp b/engines/startrek/sound.cpp index 7ce3e51017..24a9758e29 100644 --- a/engines/startrek/sound.cpp +++ b/engines/startrek/sound.cpp @@ -64,7 +64,8 @@ Sound::Sound(StarTrekEngine *vm) : _vm(vm) { } if (!SearchMan.hasFile("voc/speech.mrk")) { - error("Couldn't find 'voc/speech.mrk'. The 'trekcd/voc/' directory must be dumped from the CD"); + warning("Couldn't find 'voc/speech.mrk'. The 'trekcd/voc/' directory should be dumped from the CD. Continuing without CD audio"); + _vm->_sfxWorking = false; } _playingSpeech = false; |