[Scummvm-git-logs] scummvm master -> 208ebdc4235064ad219ab0a522129db8125f8697

[mistydemeo]

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:
208ebdc423 DIRECTOR: revert VWCR change


Commit: 208ebdc4235064ad219ab0a522129db8125f8697
    https://github.com/scummvm/scummvm/commit/208ebdc4235064ad219ab0a522129db8125f8697
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2022-08-09T21:46:45-07:00

Commit Message:
DIRECTOR: revert VWCR change

This reverts commit 706373079d49e01068904d735df0a1be72e9882e.

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 95e299b5bb7..353c653c31c 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -484,10 +484,9 @@ void Cast::loadCast() {
 	}
 
 	// CastMember Information Array
-	Common::Array<uint16> idList = _castArchive->getResourceIDList(MKTAG('V', 'W', 'C', 'R'));
-	_castIDoffset = idList.size() == 0 ? -1 : idList[0];
-	if ((r = _castArchive->getResource(MKTAG('V', 'W', 'C', 'R'), _castIDoffset)) != nullptr) {
-		loadCastDataVWCR(*r);
+	if (_castArchive->hasResource(MKTAG('V', 'W', 'C', 'R'), -1)) {
+		_castIDoffset = _castArchive->getResourceIDList(MKTAG('V', 'W', 'C', 'R'))[0];
+		loadCastDataVWCR(*(r = _castArchive->getResource(MKTAG('V', 'W', 'C', 'R'), _castIDoffset)));
 		delete r;
 	}