[Scummvm-git-logs] scummvm master -> ecb2703b0d3f73654ea72a5083921e7a40e285d8
moralrecordings
code at moral.net.au
Tue Nov 9 09:24:54 UTC 2021
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:
ecb2703b0d DIRECTOR: Do not error on missing BitmapCastMember resource
Commit: ecb2703b0d3f73654ea72a5083921e7a40e285d8
https://github.com/scummvm/scummvm/commit/ecb2703b0d3f73654ea72a5083921e7a40e285d8
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2021-11-09T09:24:51Z
Commit Message:
DIRECTOR: Do not error on missing BitmapCastMember resource
Changed paths:
engines/director/cast.cpp
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index cddf52f111..9f473c7e6d 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -776,8 +776,10 @@ void Cast::loadCastDataVWCR(Common::SeekableReadStreamEndian &stream) {
tag = MKTAG('B', 'I', 'T', 'D');
else if (_castArchive->hasResource(MKTAG('D', 'I', 'B', ' '), id + _castIDoffset))
tag = MKTAG('D', 'I', 'B', ' ');
- else
- error("Cast::loadCastDataVWCR(): non-existent reference to BitmapCastMember");
+ else {
+ warning("Cast::loadCastDataVWCR(): non-existent reference to BitmapCastMember");
+ break;
+ }
_loadedCast->setVal(id, new BitmapCastMember(this, id, stream, tag, _version, flags1));
break;
More information about the Scummvm-git-logs
mailing list