[Scummvm-git-logs] scummvm master -> 98656b492e09b0fd964e11ed2e64ad0b7baa6d2b

[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:
fbbe79e048 DIRECTOR: Don't hilite moveable sprites in D4
98656b492e DIRECTOR: Remove version check for autohilite flag


Commit: fbbe79e0487407262722e0456a8b41b83c45092e
    https://github.com/scummvm/scummvm/commit/fbbe79e0487407262722e0456a8b41b83c45092e
Author: djsrv (dservilla at gmail.com)
Date: 2021-06-07T10:34:13-04:00

Commit Message:
DIRECTOR: Don't hilite moveable sprites in D4

Changed paths:
    engines/director/sprite.cpp


diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index 09cf4ca86f..d09c4b2195 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -122,7 +122,7 @@ bool Sprite::shouldHilite() {
 	if (!isActive())
 		return false;
 
-	if (g_director->getVersion() < 400 && _moveable)
+	if (_moveable)
 		return false;
 
 	if (g_director->getVersion() < 400 && _ink == kInkTypeMatte)


Commit: 98656b492e09b0fd964e11ed2e64ad0b7baa6d2b
    https://github.com/scummvm/scummvm/commit/98656b492e09b0fd964e11ed2e64ad0b7baa6d2b
Author: djsrv (dservilla at gmail.com)
Date: 2021-06-07T10:35:51-04:00

Commit Message:
DIRECTOR: Remove version check for autohilite flag

Even though this flag was added in D3, we cannot tell the difference
between D2 movies and early D3 movies. It should always be false in D2
movies anyway.

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index c4b7e5356c..4c8e040c41 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -1200,9 +1200,7 @@ void Cast::loadCastInfo(Common::SeekableReadStreamEndian &stream, uint16 id) {
 		((SoundCastMember *)member)->_looping = castInfo.flags & 16 ? 0 : 1;
 	}
 
-	if (_vm->getVersion() >= 300) {
-		ci->autoHilite = castInfo.flags & 2;
-	}
+	ci->autoHilite = castInfo.flags & 2;
 	ci->scriptId = castInfo.scriptId;
 	if (ci->scriptId != 0)
 		_castsScriptIds[ci->scriptId] = id;