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

[bluegr]

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:
f0a0675c1c SCI: disable rgb rendering for CGA/Hercules modes


Commit: f0a0675c1cd1af8548acc75c0b40053080ee101d
    https://github.com/scummvm/scummvm/commit/f0a0675c1cd1af8548acc75c0b40053080ee101d
Author: athrxx (athrxx at scummvm.org)
Date: 2024-07-01T00:05:57+03:00

Commit Message:
SCI: disable rgb rendering for CGA/Hercules modes

The option is not compatible. It could be implemented, but it isn't trivial
and as far as my (limited) understanding goes it would be totally pointless
for these modes.

Changed paths:
    engines/sci/graphics/gfxdrivers.h
    engines/sci/graphics/screen.cpp


diff --git a/engines/sci/graphics/gfxdrivers.h b/engines/sci/graphics/gfxdrivers.h
index bf1a6fb3881..03cff4c6e3c 100644
--- a/engines/sci/graphics/gfxdrivers.h
+++ b/engines/sci/graphics/gfxdrivers.h
@@ -35,7 +35,8 @@ public:
 	uint16 screenHeight() const { return _screenH; }
 	uint16 numColors() const { return _numColors; }
 	byte hAlignment() const { return _hAlign; }
-
+	
+	virtual bool allowRGBRendering() const = 0;
 	virtual void setPalette(const byte *colors, uint start, uint num) = 0;
 	virtual void copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h) = 0;
 	virtual void replaceCursor(const void *cursor, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor) = 0;
@@ -53,6 +54,7 @@ class GfxDefaultDriver final : public GfxDriver {
 public:
 	GfxDefaultDriver(uint16 screenWidth, uint16 screenHeight);
 	~GfxDefaultDriver() override {}
+	bool allowRGBRendering() const override { return true; }
 	void setPalette(const byte *colors, uint start, uint num) override;
 	void copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h) override;
 	void replaceCursor(const void *cursor, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor) override;
@@ -62,6 +64,7 @@ class SCI0_DOSPreVGADriver : public GfxDriver {
 public:
 	SCI0_DOSPreVGADriver(int numColors, int screenW, int screenH, int horizontalAlignment);
 	~SCI0_DOSPreVGADriver() override;
+	bool allowRGBRendering() const override { return false; }
 	void setPalette(const byte*, uint, uint) override;
 protected:
 	static bool checkDriver(const char *const *driverNames, int listSize);
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 72ae503bf33..4577630ff3b 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -215,7 +215,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan, Common::RenderMode renderMode) : _
 
 	// Initialize the actual screen
 	const Graphics::PixelFormat *format = &format8;
-	if (ConfMan.getBool("rgb_rendering"))
+	if (_gfxDrv->allowRGBRendering() && ConfMan.getBool("rgb_rendering"))
 		format = nullptr; // Backend's preferred mode; RGB if available
 
 	if (g_sci->hasMacIconBar()) {