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

[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:
ff7943d576 DIRECTOR: Make loadArchive return false if no VWCF


Commit: ff7943d5767c6f10f0bc39fde751c83d147d182b
    https://github.com/scummvm/scummvm/commit/ff7943d5767c6f10f0bc39fde751c83d147d182b
Author: djsrv (dservilla at gmail.com)
Date: 2021-06-07T15:06:00-04:00

Commit Message:
DIRECTOR: Make loadArchive return false if no VWCF

Changed paths:
    engines/director/cast.cpp
    engines/director/cast.h
    engines/director/movie.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 7a3096f681..e36746108a 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -208,9 +208,10 @@ void Cast::loadArchive() {
 	loadCast();
 }
 
-void Cast::loadConfig() {
+bool Cast::loadConfig() {
 	if (!_castArchive->hasResource(MKTAG('V', 'W', 'C', 'F'), -1)) {
-		error("Cast::loadConfig(): no VWCF");
+		warning("Cast::loadConfig(): Wrong format. VWCF resource missing");
+		return false;
 	}
 
 	Common::SeekableReadStreamEndian *stream = _castArchive->getFirstResource(MKTAG('V', 'W', 'C', 'F'));
@@ -289,6 +290,7 @@ void Cast::loadConfig() {
 		_movieRect.debugPrint(1, "Cast::loadConfig(): Movie rect: ");
 
 	delete stream;
+	return true;
 }
 
 void Cast::loadCast() {
diff --git a/engines/director/cast.h b/engines/director/cast.h
index e9639ebfc7..dc342e6ab4 100644
--- a/engines/director/cast.h
+++ b/engines/director/cast.h
@@ -56,7 +56,7 @@ public:
 	Archive *getArchive() const { return _castArchive; };
 	Common::String getMacName() const { return _macName; }
 
-	void loadConfig();
+	bool loadConfig();
 	void loadCast();
 	void loadCastDataVWCR(Common::SeekableReadStreamEndian &stream);
 	void loadCastData(Common::SeekableReadStreamEndian &stream, uint16 id, Resource *res);
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 69126dd1e1..8ca481463a 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -102,7 +102,9 @@ bool Movie::loadArchive() {
 	Common::SeekableReadStreamEndian *r = nullptr;
 
 	// Config
-	_cast->loadConfig();
+	if (!_cast->loadConfig())
+		return false;
+
 	_version = _cast->_version;
 	_movieRect = _cast->_movieRect;
 	// Wait to handle _stageColor until palette is loaded in loadCast...