[Scummvm-git-logs] scummvm master -> 0f795b481df31e557af500fe862e125a158d36bf

mduggan noreply at scummvm.org
Sat Dec 9 03:36:17 UTC 2023


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:
0f795b481d GRAPHICS: MACGUI: Only set system palette if screen is CLUT8


Commit: 0f795b481df31e557af500fe862e125a158d36bf
    https://github.com/scummvm/scummvm/commit/0f795b481df31e557af500fe862e125a158d36bf
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-12-09T13:53:01+11:00

Commit Message:
GRAPHICS: MACGUI: Only set system palette if screen is CLUT8

This is needed to allow use of macgui components while 16-bit graphic games are
running, eg to display help screens.

Changed paths:
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index e60a749cdbf..c039bed5d30 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -211,7 +211,8 @@ MacWindowManager::MacWindowManager(uint32 mode, MacPatterns *patterns, Common::L
 	for (int i = 0; i < ARRAYSIZE(fillPatterns); i++)
 		_builtinPatterns.push_back(fillPatterns[i]);
 
-	g_system->getPaletteManager()->setPalette(palette, 0, ARRAYSIZE(palette) / 3);
+	if (g_system->getScreenFormat().isCLUT8())
+		g_system->getPaletteManager()->setPalette(palette, 0, ARRAYSIZE(palette) / 3);
 
 	_paletteSize = ARRAYSIZE(palette) / 3;
 	if (_paletteSize) {




More information about the Scummvm-git-logs mailing list