[Scummvm-git-logs] scummvm master -> 25008b1319d8e95c89a91aa654c07c7806d21971

[npjg]

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:
25008b1319 DIRECTOR: Update sprite loc when activating channel


Commit: 25008b1319d8e95c89a91aa654c07c7806d21971
    https://github.com/scummvm/scummvm/commit/25008b1319d8e95c89a91aa654c07c7806d21971
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-07T00:26:17-04:00

Commit Message:
DIRECTOR: Update sprite loc when activating channel

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 78ab081811..7fda7d8bd9 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -126,6 +126,10 @@ Common::Rect Channel::getBbox() {
 }
 
 void Channel::setClean(Sprite *nextSprite, int spriteId) {
+	if (!nextSprite)
+		return;
+
+	bool newSprite = (_sprite->_spriteType == kInactiveSprite && nextSprite->_spriteType != kInactiveSprite);
 	_dirty = false;
 
 	if (!_sprite->_puppet) {
@@ -134,7 +138,7 @@ void Channel::setClean(Sprite *nextSprite, int spriteId) {
 
 		// Sprites marked moveable are constrained to the same bounding box until
 		// the moveable is disabled
-		if (!_sprite->_moveable)
+		if (!_sprite->_moveable || newSprite)
 			_currentPoint = _sprite->_startPoint;
 	}