[Scummvm-git-logs] scummvm master -> 899a679d4631d29e405d4597b4ae2ddea08db6fe

[neuromancer]

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:
899a679d46 PRIVATE: Simplify the cursor code


Commit: 899a679d4631d29e405d4597b4ae2ddea08db6fe
    https://github.com/scummvm/scummvm/commit/899a679d4631d29e405d4597b4ae2ddea08db6fe
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-03-12T23:24:03-03:00

Commit Message:
PRIVATE: Simplify the cursor code

Changed paths:
    engines/private/cursors.cpp
    engines/private/private.cpp
    engines/private/private.h


diff --git a/engines/private/cursors.cpp b/engines/private/cursors.cpp
index a1b380a68d..4109b07e82 100644
--- a/engines/private/cursors.cpp
+++ b/engines/private/cursors.cpp
@@ -292,70 +292,45 @@ static const byte MOUSECURSOR_kPhone[] = {
 };
 
 static const byte cursorPalette[] = {
-	0, 0, 0,		   // Black / Transparent
+	0x00, 0x00, 0x00,  // Black / Transparent
 	0x01, 0x01, 0x01,  // Gray
 	0xff, 0xff, 0xff,  // White
 	0xff, 0x00, 0x00   // Red
 };
 
-static struct CursorDataTable {
+struct CursorTable {
 	const char *name;
-	const byte *cursor;
-} cursorDataTable[] = {
-	{ "kExit",		 MOUSECURSOR_kExit},
-	{ "kInventory",	MOUSECURSOR_kInventory},
-	{ "kTurnLeft",	 MOUSECURSOR_kTurnLeft},
-	{ "kTurnRight",	MOUSECURSOR_kTurnRight},
-	{ "kZoomIn",	   MOUSECURSOR_kZoomIn},
-	{ "kZoomOut",	  MOUSECURSOR_kZoomOut},
-	{ "kPhone",		MOUSECURSOR_kPhone},
-	{ "default",	   MOUSECURSOR_SCI},
-	{ 0, 0}
+	const void *buf;
+	int w;
+	int h;
+	int hotspotX;
+	int hotspotY;
 };
 
-static struct CursorPointTable {
-	const char *name;
-	const int coord[2];
-} cursorPointTable[] = {
-	{ "kExit",	  {9,   0} },
-	{ "kInventory", {15,  3} },
-	{ "kTurnLeft",  {29, 16} },
-	{ "kTurnRight", {1,  15} },
-	{ "kZoomIn",	{10,  8} },
-	{ "kZoomOut",   {13, 31} },
-	{ "kPhone",	 {17, 19} },
-	{ "default",	{0,   0} },
-	{ 0,			{0,   0} }
+static const CursorTable cursorTable[] = {
+	{ "kExit",      MOUSECURSOR_kExit,      32, 32, 9,  0  },
+	{ "kInventory", MOUSECURSOR_kInventory, 32, 32, 15, 3  },
+	{ "kTurnLeft",  MOUSECURSOR_kTurnLeft,  32, 32, 29, 16 },
+	{ "kTurnRight", MOUSECURSOR_kTurnRight, 32, 32, 1,  15 },
+	{ "kZoomIn",    MOUSECURSOR_kZoomIn,    32, 32, 10, 8  },
+	{ "kZoomOut",   MOUSECURSOR_kZoomOut,   32, 32, 13, 31 },
+	{ "kPhone",     MOUSECURSOR_kPhone,     32, 32, 17, 19 },
+	{ "default",    MOUSECURSOR_SCI,        11, 16, 0,  0  },
+	{ nullptr,      nullptr,                0,  0,  0,  0  }
 };
 
-void PrivateEngine::initCursors() {
-	for (Private::CursorDataTable *cur = Private::cursorDataTable; cur->name; cur++) {
-		Common::String name(cur->name);
-		_cursorData.setVal(name, cur->cursor);
-	}
-
-	for (Private::CursorPointTable *cur = Private::cursorPointTable; cur->name; cur++) {
-		Common::String name(cur->name);
-		Common::Point point = Common::Point(cur->coord[0], cur->coord[1]);
-		_cursorPoints.setVal(name, point);
-	}
-	CursorMan.replaceCursorPalette(cursorPalette, 0, 3);
-}
-
 void PrivateEngine::changeCursor(const Common::String &cursor) {
-	assert(_cursorData.contains(cursor));
-	Common::Point p = _cursorPoints.getVal(cursor);
-	int x, y;
-
-	if (cursor == "default") {
-		x = 11;
-		y = 16;
-	} else {
-		x = 32;
-		y = 32;
+	const CursorTable *entry = cursorTable;
+	while (entry->name) {
+		if (cursor == entry->name)
+			break;
+		entry++;
 	}
+	if (!entry->name)
+		return;
 
-	CursorMan.replaceCursor(_cursorData.getVal(cursor), x, y, p.x, p.y, 0, false);
+	CursorMan.replaceCursor(entry->buf, entry->w, entry->h, entry->hotspotX, entry->hotspotY, 0);
+	CursorMan.replaceCursorPalette(cursorPalette, 0, 3);
 	CursorMan.showMouse(true);
 }
 
diff --git a/engines/private/private.cpp b/engines/private/private.cpp
index 7b87480953..cda06a06df 100644
--- a/engines/private/private.cpp
+++ b/engines/private/private.cpp
@@ -157,7 +157,6 @@ Common::Error PrivateEngine::run() {
 	Settings::g_setts = new Settings::SettingMaps();
 
 	initFuncs();
-	initCursors();
 	parse(buf);
 	free(buf);
 	delete file;
diff --git a/engines/private/private.h b/engines/private/private.h
index 3c49843cd7..cd57ae84ce 100644
--- a/engines/private/private.h
+++ b/engines/private/private.h
@@ -130,8 +130,6 @@ typedef Common::Array<DossierInfo> DossierArray;
 // hash tables
 
 typedef Common::HashMap<Common::String, bool> PlayedMediaTable;
-typedef Common::HashMap<Common::String, const byte *> CursorDataMap;
-typedef Common::HashMap<Common::String, Common::Point> CursorPointMap;
 
 
 class PrivateEngine : public Engine {
@@ -201,7 +199,6 @@ public:
 	void drawScreenFrame();
 
 	void changeCursor(const Common::String &);
-	void initCursors();
 
 	// Rendering
 	Graphics::ManagedSurface *_compositeSurface;
@@ -301,10 +298,6 @@ public:
 	// Timers
 	bool installTimer(uint32, Common::String *);
 	void removeTimer();
-
-	// Cursors
-	CursorDataMap _cursorData;
-	CursorPointMap _cursorPoints;
 };
 
 extern PrivateEngine *g_private;