[Scummvm-git-logs] scummvm master -> fe5746d851ada1d1b39cbb2074fd9cbd44f9504d

[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:
fe5746d851 DIRECTOR: Handle D4 copyCastStxts without children


Commit: fe5746d851ada1d1b39cbb2074fd9cbd44f9504d
    https://github.com/scummvm/scummvm/commit/fe5746d851ada1d1b39cbb2074fd9cbd44f9504d
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-05-07T10:36:41+02:00

Commit Message:
DIRECTOR: Handle D4 copyCastStxts without children

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 0d365b39a3..59fe22ff41 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -309,9 +309,11 @@ void Score::copyCastStxts() {
 		if (c->_value->_type != kCastText && c->_value->_type != kCastButton)
 			continue;
 
-		uint stxtid = (_vm->getVersion() < 4) ?
-			c->_key + _castIDoffset :
-			c->_value->_children[0].index;
+		uint stxtid;
+		if (_vm->getVersion() >= 4 && c->_value->_children.size() > 0)
+			stxtid = c->_value->_children[0].index;
+		else
+			stxtid = c->_key + _castIDoffset;
 
 		if (_loadedStxts->getVal(stxtid)) {
 			const Stxt *stxt = _loadedStxts->getVal(stxtid);