[Scummvm-git-logs] scummvm master -> 6e63fb0336ac8ad96de896205e96c69b6975cee9

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6e63fb0336 BLADERUNNER: Don't show subtitles message for demo


Commit: 6e63fb0336ac8ad96de896205e96c69b6975cee9
    https://github.com/scummvm/scummvm/commit/6e63fb0336ac8ad96de896205e96c69b6975cee9
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-04-08T10:56:41+03:00

Commit Message:
BLADERUNNER: Don't show subtitles message for demo

This is with regard to the warning message about missing subtitles and where to find them

Changed paths:
    engines/bladerunner/bladerunner.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index d965f2ec3e2..cbee15b8880 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -601,14 +601,16 @@ 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);
-	if (MIXArchive::exists("SUBTITLES.MIX")) {
-		bool r = openArchive("SUBTITLES.MIX");
-		if (!r)
-			return false;
+	if (!_isNonInteractiveDemo) {
+		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();
+		} else {
+			debug("Download SUBTITLES.MIX from ScummVM's website to enable subtitles");
+		}
 	}
 
 	_audioMixer = new AudioMixer(this);