[Scummvm-cvs-logs] scummvm master -> ced79d8f2931098e74d6c72ec7cca43eb24c765c

clone2727 clone2727 at gmail.com
Thu Aug 18 06:26:41 CEST 2011


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:
ced79d8f29 SCUMM: Fix cursor palette in the HE80+ default cursor


Commit: ced79d8f2931098e74d6c72ec7cca43eb24c765c
    https://github.com/scummvm/scummvm/commit/ced79d8f2931098e74d6c72ec7cca43eb24c765c
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-08-17T21:21:13-07:00

Commit Message:
SCUMM: Fix cursor palette in the HE80+ default cursor

Changed paths:
    engines/scumm/cursor.cpp



diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 29b5eae..6739282 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -254,12 +254,14 @@ void ScummEngine_v80he::setDefaultCursor() {
 		}
 	}
 
-	delete cursor;
+	if (_bytesPerPixel == 1) {
+		// Since white color position is not guaranteed
+		// we setup our own palette if supported by backend
+		CursorMan.disableCursorPalette(false);
+		CursorMan.replaceCursorPalette(palette, 0xfd, cursor->getPaletteCount());
+	}
 
-	// Since white color position is not guaranteed
-	// we setup our own palette if supported by backend
-	CursorMan.disableCursorPalette(false);
-	CursorMan.replaceCursorPalette(palette, 0xfd, cursor->getPaletteCount() * 3);
+	delete cursor;
 
 	updateCursor();
 }






More information about the Scummvm-git-logs mailing list