[Scummvm-git-logs] scummvm master -> 302562de3800e46ff2c07cad4eaef5b13c039776

sev- sev at scummvm.org
Sat Sep 3 22:56:16 CEST 2016


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:
302562de38 TESTBED: Added mouse cursor


Commit: 302562de3800e46ff2c07cad4eaef5b13c039776
    https://github.com/scummvm/scummvm/commit/302562de3800e46ff2c07cad4eaef5b13c039776
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-03T22:56:09+02:00

Commit Message:
TESTBED: Added mouse cursor

Changed paths:
    engines/testbed/graphics.cpp
    engines/testbed/graphics.h



diff --git a/engines/testbed/graphics.cpp b/engines/testbed/graphics.cpp
index 4358010..4943a42 100644
--- a/engines/testbed/graphics.cpp
+++ b/engines/testbed/graphics.cpp
@@ -47,6 +47,7 @@ GFXTestSuite::GFXTestSuite() {
 
 	// Init Mouse Palette (White-black-yellow)
 	GFXtests::initMousePalette();
+	GFXtests::initMouseCursor();
 
 	// Add tests here
 
@@ -103,6 +104,29 @@ void GFXtests::initMousePalette() {
 	CursorMan.replaceCursorPalette(palette, 0, 3);
 }
 
+static const byte MOUSECURSOR_SCI[] = {
+	1,1,0,0,0,0,0,0,0,0,0,
+	1,2,1,0,0,0,0,0,0,0,0,
+	1,2,2,1,0,0,0,0,0,0,0,
+	1,2,2,2,1,0,0,0,0,0,0,
+	1,2,2,2,2,1,0,0,0,0,0,
+	1,2,2,2,2,2,1,0,0,0,0,
+	1,2,2,2,2,2,2,1,0,0,0,
+	1,2,2,2,2,2,2,2,1,0,0,
+	1,2,2,2,2,2,2,2,2,1,0,
+	1,2,2,2,2,2,2,2,2,2,1,
+	1,2,2,2,2,2,1,0,0,0,0,
+	1,2,1,0,1,2,2,1,0,0,0,
+	1,1,0,0,1,2,2,1,0,0,0,
+	0,0,0,0,0,1,2,2,1,0,0,
+	0,0,0,0,0,1,2,2,1,0,0,
+	0,0,0,0,0,0,1,2,2,1,0
+};
+
+void GFXtests::initMouseCursor() {
+	CursorMan.replaceCursor(MOUSECURSOR_SCI, 11, 16, 0, 0, 0);
+}
+
 Common::Rect GFXtests::computeSize(const Common::Rect &cursorRect, int scalingFactor, int cursorTargetScale) {
 	if (cursorTargetScale == 1 || scalingFactor == 1) {
 		// Game data and cursor would be scaled equally.
diff --git a/engines/testbed/graphics.h b/engines/testbed/graphics.h
index 139eeb9..ebb7b40 100644
--- a/engines/testbed/graphics.h
+++ b/engines/testbed/graphics.h
@@ -33,6 +33,7 @@ namespace GFXtests {
 void drawEllipse(int x, int y, int a, int b);
 void setupMouseLoop(bool disableCursorPalette = false, const char *gfxModeName = "", int cursorTargetScale = 1);
 void initMousePalette();
+void initMouseCursor();
 Common::Rect computeSize(const Common::Rect &cursorRect, int scalingFactor, int cursorTargetScale);
 void HSVtoRGB(int &rComp, int &gComp, int &bComp, int hue, int sat, int val);
 Common::Rect drawCursor(bool cursorPaletteDisabled = false, int cursorTargetScale = 1);





More information about the Scummvm-git-logs mailing list