[Scummvm-git-logs] scummvm master -> 342f51b1963c24309edfbd27c8c6e0cd5fbdb8b1

sev- sev at scummvm.org
Fri Apr 16 12:45:54 UTC 2021


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:
342f51b196 AD: Fix compilation


Commit: 342f51b1963c24309edfbd27c8c6e0cd5fbdb8b1
    https://github.com/scummvm/scummvm/commit/342f51b1963c24309edfbd27c8c6e0cd5fbdb8b1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-16T14:42:55+02:00

Commit Message:
AD: Fix compilation

Changed paths:
    engines/advancedDetector.cpp
    engines/engine.cpp
    engines/engine.h


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 88c763756f..ea439475e4 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -380,7 +380,7 @@ Common::Error AdvancedMetaEngineDetection::createInstance(OSystem *syst, Engine
 	if (((gameDescriptor.gameSupportLevel == kUnstableGame
 			|| (gameDescriptor.gameSupportLevel == kTestingGame
 					&& showTestingWarning)))
-			&& !Engine::warnUserAboutUnsupportedGame(""))
+			&& !Engine::warnUserAboutUnsupportedGame())
 		return Common::kUserCanceled;
 
 	if (gameDescriptor.gameSupportLevel == kWarningGame
diff --git a/engines/engine.cpp b/engines/engine.cpp
index 39e7b48fe0..347fbaba7a 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -644,6 +644,10 @@ void Engine::openMainMenuDialog() {
 	syncSoundSettings();
 }
 
+bool Engine::warnUserAboutUnsupportedGame() {
+	return warnUserAboutUnsupportedGame("");
+}
+
 bool Engine::warnUserAboutUnsupportedGame(Common::String msg) {
 	if (ConfMan.getBool("enable_unsupported_game_warning")) {
 		GUI::MessageDialog alert(!msg.empty() ? _("WARNING: ") + Common::U32String(msg) + _(" Shall we still run the game?") :
diff --git a/engines/engine.h b/engines/engine.h
index 2bd3588c15..d3efb48b7c 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -546,6 +546,7 @@ public:
 	 *
 	 * @return True if the user chooses to start anyway, false otherwise.
 	 */
+	static bool warnUserAboutUnsupportedGame();
 	static bool warnUserAboutUnsupportedGame(Common::String msg);
 
 	/**




More information about the Scummvm-git-logs mailing list