STARTREK: Allow engine to run without voc files

scummvm · Aug 9, 2018 · 42b2281 · 42b2281
1 parent f412328
commit 42b2281
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;