[Scummvm-git-logs] scummvm master -> c03b31794468c8198fad90584cd3e2bbbf012d5e

sev- noreply at scummvm.org
Wed Jun 14 13:16:56 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:
c03b317944 DIRECTOR: Wrap 32-bpp usage into #ifdef USE_RGB_COLOR


Commit: c03b31794468c8198fad90584cd3e2bbbf012d5e
    https://github.com/scummvm/scummvm/commit/c03b31794468c8198fad90584cd3e2bbbf012d5e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-14T15:16:44+02:00

Commit Message:
DIRECTOR: Wrap 32-bpp usage into #ifdef USE_RGB_COLOR

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index a1efc761317..954479a51d0 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -110,10 +110,16 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 		SearchMan.addSubDirectoryMatching(_gameDataDir, directoryGlob, 0, 5);
 	}
 
-	if (debugChannelSet(-1, kDebug32bpp))
+	if (debugChannelSet(-1, kDebug32bpp)) {
+#ifdef USE_RGB_COLOR
 		_colorDepth = 32;
-	else
+#else
+		warning("32-bpp color dept is not supported, forcing 8-bit");
+		_colorDepth = 8;
+#endif
+	} else {
 		_colorDepth = 8;	// 256-color
+	}
 
 	switch (getPlatform()) {
 	case Common::kPlatformMacintoshII:
@@ -199,8 +205,10 @@ Common::Error DirectorEngine::run() {
 	if (!debugChannelSet(-1, kDebugDesktop))
 		_wmMode |= Graphics::kWMModeFullscreen | Graphics::kWMModeNoDesktop;
 
+#ifdef USE_RGB_COLOR
 	if (debugChannelSet(-1, kDebug32bpp))
 		_wmMode |= Graphics::kWMMode32bpp;
+#endif
 
 	_wm = new Graphics::MacWindowManager(_wmMode, &_director3QuickDrawPatterns, getLanguage());
 	_wm->setEngine(this);




More information about the Scummvm-git-logs mailing list