[Scummvm-git-logs] scummvm master -> 0b7ee978e2ae23b8c0698c5eb32d65c7a59f3efd

[djsrv]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
57afb36f24 DIRECTOR: Set cursor to watch when switching movie
0b7ee978e2 DIRECTOR: Update cursor before new movie transition


Commit: 57afb36f24f3b0385046fc129a3f82594c0ba493
    https://github.com/scummvm/scummvm/commit/57afb36f24f3b0385046fc129a3f82594c0ba493
Author: djsrv (dservilla at gmail.com)
Date: 2021-08-11T16:31:50-04:00

Commit Message:
DIRECTOR: Set cursor to watch when switching movie

Changed paths:
    engines/director/lingo/lingo-funcs.cpp
    engines/director/score.cpp


diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index 4acf0dc6a3..5ab97d941b 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -218,6 +218,10 @@ void Lingo::func_goto(Datum &frame, Datum &movie) {
 			stage->_nextMovie.frameI = frame.asInt();
 		}
 
+		// Set cursor to watch.
+		score->_defaultCursor.readFromResource(4);
+		score->renderCursor(stage->getMousePos());
+
 		return;
 	}
 
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 4e5be0a8d1..153a89a17e 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -580,7 +580,7 @@ void Score::renderCursor(Common::Point pos, bool forceUpdate) {
 		return;
 	}
 
-	if (!_channels.empty()) {
+	if (!_channels.empty() && _playState != kPlayStopped) {
 		uint spriteId = 0;
 
 		for (int i = _channels.size() - 1; i >= 0; i--)


Commit: 0b7ee978e2ae23b8c0698c5eb32d65c7a59f3efd
    https://github.com/scummvm/scummvm/commit/0b7ee978e2ae23b8c0698c5eb32d65c7a59f3efd
Author: djsrv (dservilla at gmail.com)
Date: 2021-08-11T16:31:50-04:00

Commit Message:
DIRECTOR: Update cursor before new movie transition

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 153a89a17e..5648c1c001 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -490,6 +490,10 @@ void Score::update() {
 }
 
 void Score::renderFrame(uint16 frameId, RenderMode mode) {
+	// Force cursor update if a new movie's started.
+	if (_window->_newMovieStarted)
+		renderCursor(_movie->getWindow()->getMousePos(), true);
+
 	if (!renderTransition(frameId))
 		renderSprites(frameId, mode);
 
@@ -504,9 +508,8 @@ void Score::renderFrame(uint16 frameId, RenderMode mode) {
 	playSoundChannel(frameId);
 	playQueuedSound(); // this is currently only used in FPlayXObj
 
-	if (_cursorDirty || _window->_newMovieStarted) {
-		// Force cursor update if a new movie's started.
-		renderCursor(_movie->getWindow()->getMousePos(), _window->_newMovieStarted);
+	if (_cursorDirty) {
+		renderCursor(_movie->getWindow()->getMousePos());
 		_cursorDirty = false;
 	}
 }