[Scummvm-git-logs] scummvm master -> 924b75f1e3f8e251ee6e58fd656f1ad3dc937b3c

[djsrv]

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:
924b75f1e3 DIRECTOR: Move line that sets a cast's _score


Commit: 924b75f1e3f8e251ee6e58fd656f1ad3dc937b3c
    https://github.com/scummvm/scummvm/commit/924b75f1e3f8e251ee6e58fd656f1ad3dc937b3c
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-25T11:14:31-04:00

Commit Message:
DIRECTOR: Move line that sets a cast's _score

Before this was in an if statement that wouldn't always run.

Changed paths:
    engines/director/score-loading.cpp


diff --git a/engines/director/score-loading.cpp b/engines/director/score-loading.cpp
index c5626e388d..5d10aa68d7 100644
--- a/engines/director/score-loading.cpp
+++ b/engines/director/score-loading.cpp
@@ -822,6 +822,8 @@ void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id,
 	}
 
 	if (_loadedCast->contains(id)) { // Skip unhandled casts
+		_loadedCast->getVal(id)->_score = this;
+
 		debugCN(3, kDebugLoading, "Children: ");
 		for (uint child = 0; child < res->children.size(); child++) {
 			debugCN(3, kDebugLoading, "%d ", res->children[child].index);
@@ -894,8 +896,6 @@ void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id,
 		}
 
 		_castsInfo[id] = ci;
-
-		member->_score = this;
 	}
 
 	if (size3)