[Scummvm-git-logs] scummvm master -> 4b540a0042d11bc9c5d6d3270db8784c397ac495

sev- sev at scummvm.org
Mon May 4 22:21:37 UTC 2020


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:
4b540a0042 PINK: Remove direct use of OSystem cursor functions


Commit: 4b540a0042d11bc9c5d6d3270db8784c397ac495
    https://github.com/scummvm/scummvm/commit/4b540a0042d11bc9c5d6d3270db8784c397ac495
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-05-05T00:21:34+02:00

Commit Message:
PINK: Remove direct use of OSystem cursor functions

Changed paths:
    engines/pink/pink.cpp


diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index e9e58b0f0c..13c4b34718 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -269,11 +269,8 @@ bool PinkEngine::loadCursors() {
 }
 
 void PinkEngine::setCursor(uint cursorIndex) {
-	Graphics::Cursor *cursor = _cursors[cursorIndex]->cursors[0].cursor;
-	_system->setCursorPalette(cursor->getPalette(), cursor->getPaletteStartIndex(), cursor->getPaletteCount());
-	_system->setMouseCursor(cursor->getSurface(), cursor->getWidth(), cursor->getHeight(),
-							cursor->getHotspotX(), cursor->getHotspotY(), cursor->getKeyColor());
-	_system->showMouse(true);
+	CursorMan.replaceCursor(_cursors[cursorIndex]->cursors[0].cursor);
+	CursorMan.showMouse(true);
 }
 
 bool PinkEngine::canLoadGameStateCurrently() {




More information about the Scummvm-git-logs mailing list