[Scummvm-git-logs] scummvm master -> 64119978f90f7fdd2bae04b6f90e07e57ee761bb

[rvanlaar]

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:
64119978f9 DIRECTOR: Fix handling D5 button castmember


Commit: 64119978f90f7fdd2bae04b6f90e07e57ee761bb
    https://github.com/scummvm/scummvm/commit/64119978f90f7fdd2bae04b6f90e07e57ee761bb
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2024-09-06T18:13:28+02:00

Commit Message:
DIRECTOR: Fix handling D5 button castmember

The data for D5 button castmembers has 2 trailing bytes
compared to D5 text castmembers.
As this is the same as for D4 the special code for D5 is removed.

Changed paths:
    engines/director/castmember/text.cpp


diff --git a/engines/director/castmember/text.cpp b/engines/director/castmember/text.cpp
index f1e396c10db..c145fdac921 100644
--- a/engines/director/castmember/text.cpp
+++ b/engines/director/castmember/text.cpp
@@ -150,13 +150,7 @@ TextCastMember::TextCastMember(Cast *cast, uint16 castId, Common::SeekableReadSt
 
 	if (asButton) {
 		_type = kCastButton;
-
-		if (version < kFileVer500) {
-			_buttonType = static_cast<ButtonType>(stream.readUint16BE() - 1);
-		} else {
-			warning("TextCastMember(): Attempting to initialize >D4 button castmember");
-			_buttonType = kTypeButton;
-		}
+		_buttonType = static_cast<ButtonType>(stream.readUint16BE() - 1);
 	}
 
 	_bgcolor = g_director->_wm->findBestColor(_bgpalinfo1 & 0xff, _bgpalinfo2 & 0xff, _bgpalinfo3 & 0xff);