[Scummvm-git-logs] scummvm branch-2-5 -> dfe2c57b844f50e4344b1d750f05332dafb4128b

[eriktorbjorn]

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:
dfe2c57b84 SCUMM: The Indy 3 / Loom Macintosh cursors aren't animated


Commit: dfe2c57b844f50e4344b1d750f05332dafb4128b
    https://github.com/scummvm/scummvm/commit/dfe2c57b844f50e4344b1d750f05332dafb4128b
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-10-14T08:48:17+02:00

Commit Message:
SCUMM: The Indy 3 / Loom Macintosh cursors aren't animated

So there's no need to keep reading the cursor from the Mac resource over
and over again.

Changed paths:
    engines/scumm/cursor.cpp


diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 9f0fcc6010..d730f973ef 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -597,8 +597,6 @@ void ScummEngine_v5::resetCursors() {
 }
 
 void ScummEngine_v5::setBuiltinCursor(int idx) {
-	// TODO: This function gets called over and over. For the Mac cursors,
-	//       it should be enough to just call it once.
 	if (!_macCursorFile.empty()) {
 		Common::MacResManager resource;
 		if (resource.open(_macCursorFile)) {
@@ -606,6 +604,7 @@ void ScummEngine_v5::setBuiltinCursor(int idx) {
 			Common::SeekableReadStream *curs = resource.getResource(MKTAG('C', 'U', 'R', 'S'), resArray[0]);
 			Graphics::MacCursor macCursor;
 			if (macCursor.readFromStream(*curs)) {
+				_cursor.animate = 0;
 				CursorMan.replaceCursor(&macCursor);
 				delete curs;
 				return;
@@ -633,6 +632,7 @@ void ScummEngine_v5::setBuiltinCursor(int idx) {
 			0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
 		};
 
+		_cursor.animate = 0;
 		CursorMan.replaceCursor(buf, 15, 15, 7, 7, 0xFF);
 		return;
 	}