[Scummvm-git-logs] scummvm master -> 1b3501af9450e6378f21a80d0ff737518ffdd557

[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:
06f74a2416 DIRECTOR: Set initial values for CastMemberInfo fields
1b3501af94 DIRECTOR: Autohilite matte sprites in D3


Commit: 06f74a2416a212bad4d2895984e5d5ff92944e26
    https://github.com/scummvm/scummvm/commit/06f74a2416a212bad4d2895984e5d5ff92944e26
Author: djsrv (dservilla at gmail.com)
Date: 2021-06-04T19:17:59-04:00

Commit Message:
DIRECTOR: Set initial values for CastMemberInfo fields

Changed paths:
    engines/director/castmember.h


diff --git a/engines/director/castmember.h b/engines/director/castmember.h
index 9c860d6b57..e78f60b838 100644
--- a/engines/director/castmember.h
+++ b/engines/director/castmember.h
@@ -294,6 +294,8 @@ struct CastMemberInfo {
 	EditInfo textEditInfo;
 	Common::String modifiedBy;
 	Common::String comments;
+
+	CastMemberInfo() : autoHilite(false), scriptId(0) {}
 };
 
 struct Label {


Commit: 1b3501af9450e6378f21a80d0ff737518ffdd557
    https://github.com/scummvm/scummvm/commit/1b3501af9450e6378f21a80d0ff737518ffdd557
Author: djsrv (dservilla at gmail.com)
Date: 2021-06-04T19:17:59-04:00

Commit Message:
DIRECTOR: Autohilite matte sprites in D3

Changed paths:
    engines/director/sprite.cpp


diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index 1b2d555a22..09cf4ca86f 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -125,8 +125,8 @@ bool Sprite::shouldHilite() {
 	if (g_director->getVersion() < 400 && _moveable)
 		return false;
 
-	if (g_director->getVersion() < 300)
-		return _ink == kInkTypeMatte;
+	if (g_director->getVersion() < 400 && _ink == kInkTypeMatte)
+		return true;
 
 	if (_cast) {
 		CastMemberInfo *castInfo = _cast->getInfo();