From 302562de3800e46ff2c07cad4eaef5b13c039776 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 3 Sep 2016 22:23:02 +0200 Subject: [PATCH] TESTBED: Added mouse cursor --- engines/testbed/graphics.cpp | 24 ++++++++++++++++++++++++ engines/testbed/graphics.h | 1 + 2 files changed, 25 insertions(+) diff --git a/engines/testbed/graphics.cpp b/engines/testbed/graphics.cpp index 43580104e70b..4943a42284b1 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 139eeb97ddfe..ebb7b40be858 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);