[Scummvm-git-logs] scummvm master -> 9339b3b3c3c45c1de09fc95d40632e8b9cfb9bcc

[athrxx]

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:
9339b3b3c3 SCI: (KQ6/MAC) - icon bar colors in rgb render mode


Commit: 9339b3b3c3c45c1de09fc95d40632e8b9cfb9bcc
    https://github.com/scummvm/scummvm/commit/9339b3b3c3c45c1de09fc95d40632e8b9cfb9bcc
Author: athrxx (athrxx at scummvm.org)
Date: 2024-11-01T01:26:51+01:00

Commit Message:
SCI: (KQ6/MAC) - icon bar colors in rgb render mode

Changed paths:
    engines/sci/graphics/maciconbar.cpp


diff --git a/engines/sci/graphics/maciconbar.cpp b/engines/sci/graphics/maciconbar.cpp
index 640a3dd5fa9..41a3240b6f1 100644
--- a/engines/sci/graphics/maciconbar.cpp
+++ b/engines/sci/graphics/maciconbar.cpp
@@ -23,6 +23,7 @@
 #include "sci/engine/kernel.h"
 #include "sci/engine/selector.h"
 #include "sci/engine/state.h"
+#include "sci/graphics/gfxdrivers.h"
 #include "sci/graphics/maciconbar.h"
 #include "sci/graphics/palette.h"
 #include "sci/graphics/screen.h"
@@ -199,15 +200,15 @@ void GfxMacIconBar::drawImage(Graphics::Surface *surface, const Common::Rect &re
 			upscaleSurface.init(dstRect.width(), dstRect.height(), dstRect.width(), _upscaleBuffer->getUnsafeDataAt(0, upscaleSize), surface->format);
 			drawDisabledPattern(upscaleSurface, dstRect);
 		}
-		g_system->copyRectToScreen(_upscaleBuffer->getUnsafeDataAt(0, upscaleSize), dstRect.width(), dstRect.left, dstRect.top, dstRect.width(), dstRect.height());
+		_screen->gfxDriver()->copyRectToScreen(_upscaleBuffer->getUnsafeDataAt(0, upscaleSize), 0, 0, dstRect.width(), dstRect.left, dstRect.top, dstRect.width(), dstRect.height(), nullptr, nullptr);
 	} else {
 		if (!enable) {
 			Graphics::Surface disableSurface;
 			disableSurface.copyFrom(*surface);
 			drawDisabledPattern(disableSurface, rect);
-			g_system->copyRectToScreen(disableSurface.getPixels(), disableSurface.pitch, rect.left, rect.top, rect.width(), rect.height());
+			_screen->gfxDriver()->copyRectToScreen((const byte*)disableSurface.getPixels(), 0, 0, disableSurface.pitch, rect.left, rect.top, rect.width(), rect.height(), nullptr, nullptr);
 		} else {
-			g_system->copyRectToScreen(surface->getPixels(), surface->pitch, rect.left, rect.top, rect.width(), rect.height());
+			_screen->gfxDriver()->copyRectToScreen((const byte*)surface->getPixels(), 0, 0, surface->pitch, rect.left, rect.top, rect.width(), rect.height(), nullptr, nullptr);
 		}
 	}
 }