[Scummvm-git-logs] scummvm master -> ca97db0fbd9167079305c95906db97293f6e723b

[ysj1173886760]

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:
ffb5be1937 DIRECTOR: always draw in updateStage
ca97db0fbd DIRECTOR: don't update currentClickOnSpriteId when button is up.


Commit: ffb5be19371ff6f3023579dea6d2c05f89d925e5
    https://github.com/scummvm/scummvm/commit/ffb5be19371ff6f3023579dea6d2c05f89d925e5
Author: ysj1173886760 (1173886760 at qq.com)
Date: 2021-08-11T14:44:56+08:00

Commit Message:
DIRECTOR: always draw in updateStage

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 6a168b14b1..1a4bc25209 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -2296,8 +2296,8 @@ void LB::b_updateStage(int nargs) {
 	if (movie->_videoPlayback)
 		score->renderVideo();
 
-	if (movie->getWindow()->render())
-		g_director->draw();
+	movie->getWindow()->render();
+	g_director->draw();
 
 	// play any puppet sounds that have been queued
 	score->playSoundChannel(score->getCurrentFrame());


Commit: ca97db0fbd9167079305c95906db97293f6e723b
    https://github.com/scummvm/scummvm/commit/ca97db0fbd9167079305c95906db97293f6e723b
Author: ysj1173886760 (1173886760 at qq.com)
Date: 2021-08-11T16:40:21+08:00

Commit Message:
DIRECTOR: don't update currentClickOnSpriteId when button is up.

Changed paths:
    engines/director/events.cpp


diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 0b33a1c6f5..673169e3d2 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -198,8 +198,6 @@ bool Movie::processEvent(Common::Event &event) {
 	case Common::EVENT_LBUTTONUP:
 		pos = _window->getMousePos();
 
-		_currentClickOnSpriteId = sc->getActiveSpriteIDFromPos(pos);
-
 		if (_currentHiliteChannelId && sc->_channels[_currentHiliteChannelId]) {
 			g_director->getCurrentWindow()->setDirty(true);
 			g_director->getCurrentWindow()->addDirtyRect(sc->_channels[_currentHiliteChannelId]->getBbox());