[Scummvm-git-logs] scummvm master -> 293881c016e06b72b2190aa843fbe8a341f15ba0

[dreammaster]

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:
293881c016 TINSEL: Include filename when giving unsupported compression errors


Commit: 293881c016e06b72b2190aa843fbe8a341f15ba0
    https://github.com/scummvm/scummvm/commit/293881c016e06b72b2190aa843fbe8a341f15ba0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-11T09:36:52-07:00

Commit Message:
TINSEL: Include filename when giving unsupported compression errors

Changed paths:
    engines/tinsel/handle.cpp
    engines/tinsel/strres.cpp


diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index 117bf46718..2f8e5775af 100644
--- a/engines/tinsel/handle.cpp
+++ b/engines/tinsel/handle.cpp
@@ -274,14 +274,14 @@ void LoadFile(MEMHANDLE *pH) {
 	Common::File f;
 	char szFilename[sizeof(pH->szName) + 1];
 
-	if (pH->filesize & fCompressed) {
-		error("Compression handling has been removed");
-	}
-
 	// extract and zero terminate the filename
 	memcpy(szFilename, pH->szName, sizeof(pH->szName));
 	szFilename[sizeof(pH->szName)] = 0;
 
+	if (pH->filesize & fCompressed) {
+		error("Compression handling has been removed - %s", szFilename);
+	}
+
 	if (f.open(szFilename)) {
 		// read the data
 		int bytes;
diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp
index 32aefd008a..e31e3c2a22 100644
--- a/engines/tinsel/strres.cpp
+++ b/engines/tinsel/strres.cpp
@@ -137,8 +137,9 @@ void ChangeLanguage(LANGUAGE newLang) {
 
 		// close the file
 		f.close();
-	} else {	// the file must be compressed
-		error("Compression handling has been removed");
+	} else {
+		// the file must be compressed
+		error("Compression handling for text file has been removed");
 	}
 }