[Scummvm-git-logs] scummvm master -> 87b96cd34e0f9f02a4e7a94b4b0e55e787b9ce19

[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:
87b96cd34e DIRECTOR: Re-add Director version checks for autopuppet flag


Commit: 87b96cd34e0f9f02a4e7a94b4b0e55e787b9ce19
    https://github.com/scummvm/scummvm/commit/87b96cd34e0f9f02a4e7a94b4b0e55e787b9ce19
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-07-14T22:34:38+02:00

Commit Message:
DIRECTOR: Re-add Director version checks for autopuppet flag

Dropping D6+ checks there were a speculation which let Dream sequence
in totaldistortion work. However, that had a side effect that the ink
was not copied, as the channel was declared autopuppet.

This restores the ink behaviour while keeping shooting as working

--start-movie="ATD\HD\bdDREAMA.DXR"  totaldistortion-win

Changed paths:
    engines/director/channel.cpp


diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index 1e6d54749ca..8097dfb9aa4 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -548,7 +548,7 @@ void Channel::setWidth(int w) {
 		return;
 	_width = MAX<int>(w, 0);
 
-	if (!_sprite->_puppet) {
+	if (!_sprite->_puppet && g_director->getVersion() >= 600) {
 		// Based on Director in a Nutshell, page 15
 		_sprite->_autoPuppet = true;
 	}
@@ -559,7 +559,7 @@ void Channel::setHeight(int h) {
 		return;
 	_height = MAX<int>(h, 0);
 
-	if (!_sprite->_puppet) {
+	if (!_sprite->_puppet && g_director->getVersion() >= 600) {
 		// Based on Director in a Nutshell, page 15
 		_sprite->_autoPuppet = true;
 	}
@@ -581,7 +581,7 @@ void Channel::setBbox(int l, int t, int r, int b) {
 	if (_width <= 0 || _height <= 0)
 		_width = _height = 0;
 
-	if (!_sprite->_puppet) {
+	if (!_sprite->_puppet && g_director->getVersion() >= 600) {
 		// Based on Director in a Nutshell, page 15
 		_sprite->_autoPuppet = true;
 	}
@@ -596,7 +596,7 @@ void Channel::setPosition(int x, int y, bool force) {
 	}
 	_currentPoint = newPos;
 
-	if (!_sprite->_puppet) {
+	if (!_sprite->_puppet && g_director->getVersion() >= 600) {
 		// Based on Director in a Nutshell, page 15
 		_sprite->_autoPuppet = true;
 	}