[Scummvm-git-logs] scummvm master -> 669b9a0ffd75c8517c08c18a0f251a075ca4f7a1

[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:
669b9a0ffd ENGINES: Allow checkCD to run for all platforms


Commit: 669b9a0ffd75c8517c08c18a0f251a075ca4f7a1
    https://github.com/scummvm/scummvm/commit/669b9a0ffd75c8517c08c18a0f251a075ca4f7a1
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-05-02T22:00:57+03:00

Commit Message:
ENGINES: Allow checkCD to run for all platforms

In order to prompt for CD versions missing the extracted audio files

Changed paths:
    engines/engine.cpp


diff --git a/engines/engine.cpp b/engines/engine.cpp
index 39e7b48fe0..d42774b53a 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -457,22 +457,14 @@ void GUIErrorMessageFormat(Common::U32String fmt, ...) {
 }
 
 void Engine::checkCD() {
-#if defined(WIN32) && !defined(__SYMBIAN32__)
-	// It is a known bug under Windows that games that play CD audio cause
-	// ScummVM to crash if the data files are read from the same CD. Check
-	// if this appears to be the case and issue a warning.
-
-	// If we can find a compressed audio track, then it should be ok even
-	// if it's running from CD.
-
 #ifdef USE_VORBIS
 	if (Common::File::exists("track1.ogg") ||
 	    Common::File::exists("track01.ogg"))
 		return;
 #endif
 #ifdef USE_FLAC
-	if (Common::File::exists("track1.fla") ||
-			Common::File::exists("track1.flac") ||
+	if (Common::File::exists("track1.fla")  ||
+	    Common::File::exists("track1.flac") ||
 	    Common::File::exists("track01.fla") ||
 	    Common::File::exists("track01.flac"))
 		return;
@@ -483,6 +475,13 @@ void Engine::checkCD() {
 		return;
 #endif
 
+#if defined(WIN32) && !defined(__SYMBIAN32__)
+	// It is a known bug under Windows that games that play CD audio cause
+	// ScummVM to crash if the data files are read from the same CD. Check
+	// if this appears to be the case and issue a warning.
+
+	// If we can find a compressed audio track, then it should be ok even
+	// if it's running from CD.
 	char buffer[MAXPATHLEN];
 	int i;
 
@@ -508,9 +507,10 @@ void Engine::checkCD() {
 			"from the CD. This is known to cause problems,\n"
 			"and it is therefore recommended that you copy\n"
 			"the data files to your hard disk instead.\n"
-			"See the README file for details."), _("OK"));
+			"See the Documentation (CD audio) for details."), _("OK"));
 		dialog.runModal();
 	} else {
+#endif // defined(WIN32) && !defined(__SYMBIAN32__)
 		// If we reached here, the game has audio tracks,
 		// it's not ran from the CD and the tracks have not
 		// been ripped.
@@ -519,10 +519,11 @@ void Engine::checkCD() {
 			"tracks need to be ripped from the disk using\n"
 			"an appropriate CD audio extracting tool in\n"
 			"order to listen to the game's music.\n"
-			"See the README file for details."), _("OK"));
+			"See the Documentation (CD audio) for details."), _("OK"));
 		dialog.runModal();
+#if defined(WIN32) && !defined(__SYMBIAN32__)
 	}
-#endif
+#endif // defined(WIN32) && !defined(__SYMBIAN32__)
 }
 
 void Engine::handleAutoSave() {