[Scummvm-git-logs] scummvm master -> 78135f8dfad913126567ce403d607a6b9de6d1e6

[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:
5b8b2bb25f DIRECTOR: Fix incorrect bitwise operation. CID 1490801
78135f8dfa SCUMM: Improved workding for unknonw game variants message


Commit: 5b8b2bb25f764f734904920b23b713aa8622c2b7
    https://github.com/scummvm/scummvm/commit/5b8b2bb25f764f734904920b23b713aa8622c2b7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-10T12:03:36+02:00

Commit Message:
DIRECTOR: Fix incorrect bitwise operation. CID 1490801

Changed paths:
    engines/director/game-quirks.cpp


diff --git a/engines/director/game-quirks.cpp b/engines/director/game-quirks.cpp
index e742ca32cab..d0fdc8a15ff 100644
--- a/engines/director/game-quirks.cpp
+++ b/engines/director/game-quirks.cpp
@@ -80,7 +80,7 @@ static void quirkKidsBox() {
     // a full screen 640x480 game window. If desktop mode is off, ScummVM
     // will pick a game window that fits the splash screen and then try
     // to squish the full size game window into it.
-    g_director->_wmMode &= !Graphics::kWMModeNoDesktop;
+    g_director->_wmMode &= ~Graphics::kWMModeNoDesktop;
     // Game runs in 640x480; clipping it to this size ensures the main
     // game window takes up the full screen, and only the splash is windowed.
     g_director->_wmWidth = 640;


Commit: 78135f8dfad913126567ce403d607a6b9de6d1e6
    https://github.com/scummvm/scummvm/commit/78135f8dfad913126567ce403d607a6b9de6d1e6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-10T12:03:36+02:00

Commit Message:
SCUMM: Improved workding for unknonw game variants message

Changed paths:
    engines/scumm/metaengine.cpp


diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index e958178e2c3..9a9b93ddf21 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -314,10 +314,9 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) {
 	if (!findInMD5Table(res.md5.c_str())) {
 		Common::String md5Warning;
 
-		md5Warning = ("Your game version appears to be unknown. If this is *NOT* a fan-modified\n"
-		               "version (in particular, not a fan-made translation), please, report the\n"
-		               "following data to the ScummVM team along with the name of the game you tried\n"
-		               "to add and its version, language, etc.:\n");
+		md5Warning = ("Your game version appears to be unknown. Please, report the following data to the\n"
+		               "ScummVM team along with the name of the game you tried to add and its version,\n"
+					   "language, etc.:\n");
 
 		md5Warning += Common::String::format("  SCUMM gameid '%s', file '%s', MD5 '%s'\n\n",
 				res.game.gameid,