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

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
268ce42c84 DIRECTOR: Proceed if built-in RIFF archive is errorneous
8b7877b393 DIRECTOR: Fix crash when referred movie does not exist
c740cbb37b DIRECTOR: Added support for L-ZONE Win derectory stucture


Commit: 268ce42c843a63b3c3c3764800dd1ae8324a77aa
    https://github.com/scummvm/scummvm/commit/268ce42c843a63b3c3c3764800dd1ae8324a77aa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-14T00:35:54+02:00

Commit Message:
DIRECTOR: Proceed if built-in RIFF archive is errorneous

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index b07845dda5..684509ec12 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -259,9 +259,9 @@ void Stage::loadEXEv3(Common::SeekableReadStream *stream) {
 		_mainArchive = new RIFFArchive();
 
 		if (!_mainArchive->openStream(stream, riffOffset))
-			error("Failed to load RIFF from EXE");
-
-		return;
+			warning("Failed to load RIFF from EXE");
+		else
+			return;
 	}
 
 	openMainArchive(mmmFileName);


Commit: 8b7877b3933899fb8366ca2a5227effb8abbbf35
    https://github.com/scummvm/scummvm/commit/8b7877b3933899fb8366ca2a5227effb8abbbf35
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-14T00:36:19+02:00

Commit Message:
DIRECTOR: Fix crash when referred movie does not exist

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 684509ec12..c4015a4a65 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -211,7 +211,8 @@ void Stage::loadEXE(const Common::String movie) {
 		}
 	}
 
-	_mainArchive->setFileName(movie);
+	if (_mainArchive)
+		_mainArchive->setFileName(movie);
 }
 
 void Stage::loadEXEv3(Common::SeekableReadStream *stream) {


Commit: c740cbb37be1500086c949140b4fb79b588be5a3
    https://github.com/scummvm/scummvm/commit/c740cbb37be1500086c949140b4fb79b588be5a3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-14T00:41:43+02:00

Commit Message:
DIRECTOR: Added support for L-ZONE Win derectory stucture

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 2f8d11415a..21e82726d9 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -99,6 +99,7 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 	SearchMan.addSubDirectoryMatching(gameDataDir, "install");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "main");		// Meet Mediaband
 	SearchMan.addSubDirectoryMatching(gameDataDir, "l_zone");
+	SearchMan.addSubDirectoryMatching(gameDataDir, "win_data", 0, 2);	// L-ZONE
 
 	_colorDepth = 8;	// 256-color
 	_key = 0;