[Scummvm-git-logs] scummvm master -> 100dde586a9d0d8c9bacbca922f5b31bf8abb5d0

[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:
100dde586a DIRECTOR: Properly init D4 button casts


Commit: 100dde586a9d0d8c9bacbca922f5b31bf8abb5d0
    https://github.com/scummvm/scummvm/commit/100dde586a9d0d8c9bacbca922f5b31bf8abb5d0
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-10T09:36:56-04:00

Commit Message:
DIRECTOR: Properly init D4 button casts

Changed paths:
    engines/director/castmember.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 6b58e32f15..276836e555 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -397,17 +397,11 @@ TextCastMember::TextCastMember(Cast *cast, uint16 castId, Common::ReadStreamEndi
 	if (asButton) {
 		_type = kCastButton;
 
-		if (version < 4) {
+		if (version <= 4) {
 			_buttonType = static_cast<ButtonType>(stream.readUint16BE() - 1);
 		} else {
-			stream.readByte();
-			stream.readByte();
-
-			// This has already been populated in the super TextCastMember constructor
-			//initialRect = Score::readRect(stream);
-			//boundingRect = Score::readRect(stream);
-
-			_buttonType = static_cast<ButtonType>(stream.readUint16BE());
+			warning("TextCastMember(): Attempting to initialize >D4 button castmember");
+			_buttonType = kTypeButton;
 		}
 	}