[Scummvm-git-logs] scummvm master -> 463dddfa2e2a6b5b3af8014ec97098660450ab8b

[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:
88dedd276e JANITORIAL: Rename constants to follow our code naming conventions
463dddfa2e GRAPHICS: MACGUI: Do not load desktop background multiple times and fix setMode()


Commit: 88dedd276e1375db33ef6d77be1f4cfe2620b347
    https://github.com/scummvm/scummvm/commit/88dedd276e1375db33ef6d77be1f4cfe2620b347
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-19T20:25:06+02:00

Commit Message:
JANITORIAL: Rename constants to follow our code naming conventions

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


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 05f4118dcc6..9c6ab12e2eb 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -85,7 +85,7 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 	_version = getDescriptionVersion();
 	_fixStageSize = false;
 	_fixStageRect = Common::Rect();
-	_wmMode = debugChannelSet(-1, kDebugDesktop) ? wmModeDesktop : wmModeFullscreen;
+	_wmMode = debugChannelSet(-1, kDebugDesktop) ? kWMModeDesktop : kWMModeFullscreen;
 
 	_wmWidth = 1024;
 	_wmHeight = 768;
diff --git a/engines/director/director.h b/engines/director/director.h
index 47b90d277a6..21d4f844575 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -55,8 +55,8 @@ class ManagedSurface;
 
 namespace Director {
 
-const uint32 wmModeDesktop = Graphics::kWMModalMenuMode | Graphics::kWMModeManualDrawWidgets;
-const uint32 wmModeFullscreen = Graphics::kWMModalMenuMode | Graphics::kWMModeNoDesktop
+const uint32 kWMModeDesktop = Graphics::kWMModalMenuMode | Graphics::kWMModeManualDrawWidgets;
+const uint32 kWMModeFullscreen = Graphics::kWMModalMenuMode | Graphics::kWMModeNoDesktop
 	| Graphics::kWMModeManualDrawWidgets | Graphics::kWMModeFullscreen;
 
 class Archive;
diff --git a/engines/director/game-quirks.cpp b/engines/director/game-quirks.cpp
index d6cfacab4d4..3b808cafa93 100644
--- a/engines/director/game-quirks.cpp
+++ b/engines/director/game-quirks.cpp
@@ -29,7 +29,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 = Director::wmModeDesktop;
+    g_director->_wmMode = Director::kWMModeDesktop;
     // 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: 463dddfa2e2a6b5b3af8014ec97098660450ab8b
    https://github.com/scummvm/scummvm/commit/463dddfa2e2a6b5b3af8014ec97098660450ab8b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-19T20:38:39+02:00

Commit Message:
GRAPHICS: MACGUI: Do not load desktop background multiple times and fix setMode()

Changed paths:
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 48abf528a08..96046daa833 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -251,10 +251,13 @@ MacWindowManager::~MacWindowManager() {
 
 void MacWindowManager::setDesktopMode(uint32 mode) {
 	if (!(mode & Graphics::kWMNoScummVMWallpaper)) {
-		loadDesktop();
+		if (_mode & Graphics::kWMNoScummVMWallpaper)
+			loadDesktop();
 	} else if (_desktopBmp) {
 		_desktopBmp->free();
 	}
+
+	_mode = mode;
 }
 
 void MacWindowManager::setScreen(ManagedSurface *screen) {