diff options
| author | Peter Kohaut | 2019-03-09 23:03:24 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2019-03-09 23:06:35 +0100 |
| commit | 06629b08264274dca426be5d824e9ebe31219cb2 (patch) | |
| tree | eac44bb88dbbe74ac84623ab512be7131ab87794 /engines/bladerunner/bladerunner.cpp | |
| parent | ba85cec40d494a0b733d77071efef84b9ac68394 (diff) | |
| download | scummvm-rg350-06629b08264274dca426be5d824e9ebe31219cb2.tar.gz scummvm-rg350-06629b08264274dca426be5d824e9ebe31219cb2.tar.bz2 scummvm-rg350-06629b08264274dca426be5d824e9ebe31219cb2.zip | |
BLADERUNNER: Clean-up for subtitles initialization code
Diffstat (limited to 'engines/bladerunner/bladerunner.cpp')
| -rw-r--r-- | engines/bladerunner/bladerunner.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp index 793939df9a..d93bb3dad0 100644 --- a/engines/bladerunner/bladerunner.cpp +++ b/engines/bladerunner/bladerunner.cpp @@ -371,13 +371,17 @@ bool BladeRunnerEngine::startup(bool hasSavegames) { // Try to load the SUBTITLES.MIX first, before Startup.MIX // allows overriding any identically named resources (such as the original font files and as a bonus also the TRE files for the UI and dialogue menu) _subtitles = new Subtitles(this); - bool r = openArchive("SUBTITLES.MIX"); - if (!r) { - _subtitles->setSubtitlesSystemInactive(true); // no subtitles support + if (MIXArchive::exists("SUBTITLES.MIX")) { + bool r = openArchive("SUBTITLES.MIX"); + if (!r) + return false; + + _subtitles->init(); + } else { + debug("Download SUBTITLES.MIX from ScummVM's website to enable subtitles"); } - _subtitles->init(); - r = openArchive("STARTUP.MIX"); + bool r = openArchive("STARTUP.MIX"); if (!r) return false; |