[Scummvm-git-logs] scummvm master -> 2321decd30dce344d8095a64f8394401ae28b5e4

[sev-]

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:
2321decd30 DIRECTOR: Persist immeidate sprite flag when copying channels


Commit: 2321decd30dce344d8095a64f8394401ae28b5e4
    https://github.com/scummvm/scummvm/commit/2321decd30dce344d8095a64f8394401ae28b5e4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-05-17T23:14:07+02:00

Commit Message:
DIRECTOR: Persist immeidate sprite flag when copying channels

Lingo `set the immediate of sprite` is getting lost when we copy over
the sprites to the channels. Now we inherit this setting in the copy.

Fixes 'PopUp Menu' in theapartment: without this fix we are losing the
interactivity as soon as we select a pop-up menu item once.

Changed paths:
    engines/director/channel.cpp


diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index 89d25373241..52e9c3aabd6 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -526,9 +526,13 @@ void Channel::replaceSprite(Sprite *nextSprite) {
 
 	int width = _width;
 	int height = _height;
+	bool immediate = _sprite->_immediate;
 
 	*_sprite = *nextSprite;
 
+	// Persist the immediate flag
+	_sprite->_immediate = immediate;
+
 	// TODO: auto expand text size is meaning less for us, not all text
 	// since we are using initialRect for the text cast member now, then the sprite size is meaning less for us.
 	// thus, we keep the _sprite size here