[Scummvm-cvs-logs] scummvm master -> 2f03bc77764edca085753ff99ea363de34bde1df

Strangerke Strangerke at scummvm.org
Mon Jan 25 00:42:37 CET 2016


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:
2f03bc7776 LAB: Add a workaround to load the right file in rooms 121 & 122 (Dos and Windows)


Commit: 2f03bc77764edca085753ff99ea363de34bde1df
    https://github.com/scummvm/scummvm/commit/2f03bc77764edca085753ff99ea363de34bde1df
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-01-25T00:35:38+01:00

Commit Message:
LAB: Add a workaround to load the right file in rooms 121 & 122 (Dos and Windows)

Changed paths:
    engines/lab/resource.cpp



diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp
index ed0cb37..aae369f 100644
--- a/engines/lab/resource.cpp
+++ b/engines/lab/resource.cpp
@@ -143,7 +143,14 @@ void Resource::readViews(uint16 roomNum) {
 }
 
 Common::String Resource::translateFileName(const Common::String filename) {
-	Common::String upperFilename = filename;
+	Common::String upperFilename;
+
+	// The DOS and Windows version aren't looking for the right file, 
+	if (!filename.compareToIgnoreCase("P:ZigInt/BLK") && (_vm->getPlatform() != Common::kPlatformAmiga))
+		upperFilename = "P:ZigInt/ZIGINT.BLK";
+	else
+		upperFilename = filename;
+
 	upperFilename.toUppercase();
 	Common::String fileNameStrFinal;
 
@@ -211,7 +218,7 @@ Common::String Resource::translateFileName(const Common::String filename) {
 Common::File *Resource::openDataFile(const Common::String filename, uint32 fileHeader) {
 	Common::File *dataFile = new Common::File();
 	dataFile->open(translateFileName(filename));
-	warning("%s", filename.c_str());
+
 	if (!dataFile->isOpen()) {
 		// The DOS version is known to have some missing files
 		if (_vm->getPlatform() == Common::kPlatformDOS) {






More information about the Scummvm-git-logs mailing list