[Scummvm-git-logs] scummvm master -> 03b9943ec067e6cfecd6784570246111bb556d3c

[ccawley2011]

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:
03b9943ec0 Revert "GUI: Convert the cursor bitmap to the overlay format"


Commit: 03b9943ec067e6cfecd6784570246111bb556d3c
    https://github.com/scummvm/scummvm/commit/03b9943ec067e6cfecd6784570246111bb556d3c
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-05-15T00:20:00+01:00

Commit Message:
Revert "GUI: Convert the cursor bitmap to the overlay format"

This reverts commit 26dc725ed25bd40fcec738a2ddb32c2d2c59000d.

Changed paths:
    gui/ThemeEngine.cpp


diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 2a732d973e..dd2b934f95 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1534,16 +1534,16 @@ bool ThemeEngine::createCursor(const Common::String &filename, int hotspotX, int
 	_cursorHeight = cursor->h;
 
 #ifdef USE_RGB_COLOR
-	_cursorFormat = _overlayFormat;
+	_cursorFormat = cursor->format;
 	_cursorTransparent = _cursorFormat.RGBToColor(0xFF, 0, 0xFF);
 
 	// Allocate a new buffer for the cursor
 	delete[] _cursor;
 	_cursor = new byte[_cursorWidth * _cursorHeight * _cursorFormat.bytesPerPixel];
 	assert(_cursor);
-	Graphics::crossBlit(_cursor, (const byte *)cursor->getPixels(),
-	                    _cursorWidth * _cursorFormat.bytesPerPixel, cursor->pitch,
-	                    _cursorWidth, _cursorHeight, _cursorFormat, cursor->format);
+	Graphics::copyBlit(_cursor, (const byte *)cursor->getPixels(),
+	                   _cursorWidth * _cursorFormat.bytesPerPixel, cursor->pitch,
+	                   _cursorWidth, _cursorHeight, _cursorFormat.bytesPerPixel);
 
 	_useCursor = true;
 #else