[Scummvm-git-logs] scummvm master -> 46cd550b7c8ae348bba3027dae3b190d68bb047a

[sev-]

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

Summary:
94f0fe722f ENGINES: Remove redundant overload
46cd550b7c ENGINES: Fix article in comment


Commit: 94f0fe722fbb97fa4278f327a26453482bc50b8d
    https://github.com/scummvm/scummvm/commit/94f0fe722fbb97fa4278f327a26453482bc50b8d
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-04-20T02:31:58+02:00

Commit Message:
ENGINES: Remove redundant overload

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


diff --git a/engines/engine.cpp b/engines/engine.cpp
index 347fbaba7a..39e7b48fe0 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -644,10 +644,6 @@ 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 d3efb48b7c..b8a252c9ab 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -546,8 +546,7 @@ public:
 	 *
 	 * @return True if the user chooses to start anyway, false otherwise.
 	 */
-	static bool warnUserAboutUnsupportedGame();
-	static bool warnUserAboutUnsupportedGame(Common::String msg);
+	static bool warnUserAboutUnsupportedGame(Common::String msg = Common::String());
 
 	/**
 	 * Display an error message to the user that the game is not supported.


Commit: 46cd550b7c8ae348bba3027dae3b190d68bb047a
    https://github.com/scummvm/scummvm/commit/46cd550b7c8ae348bba3027dae3b190d68bb047a
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-04-20T02:31:58+02:00

Commit Message:
ENGINES: Fix article in comment

Changed paths:
    engines/engine.h


diff --git a/engines/engine.h b/engines/engine.h
index b8a252c9ab..c2198eaa5f 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -541,7 +541,7 @@ public:
 	/**
 	 * Display a warning to the user that the game is not fully supported.
 	 *
-	 * @param msg  An message that will be presented to user. If empty, then
+	 * @param msg  A message that will be presented to user. If empty, then
 	 *             generic message regarding unsupported game is presented
 	 *
 	 * @return True if the user chooses to start anyway, false otherwise.