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

[dwatteau]

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:
b23d45b9ba SCUMM: Only print invalid index blocktypes in hex in resource_v4.cpp


Commit: b23d45b9bac436494f3fa64baffe1b97b2b11251
    https://github.com/scummvm/scummvm/commit/b23d45b9bac436494f3fa64baffe1b97b2b11251
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-09-27T12:13:53+02:00

Commit Message:
SCUMM: Only print invalid index blocktypes in hex in resource_v4.cpp

If an invalid blocktype is encountered, there is no guarantee that its
character representation would be ASCII-printable, and very strange
results could happen. Just print it in hex, as in resource.cpp (using
tag2str would be safe since it handles non-printable characters, but it
only works on four-byte values).

Also make the error message closer to the less ambiguous one from
resource.cpp.

Changed paths:
    engines/scumm/resource_v4.cpp


diff --git a/engines/scumm/resource_v4.cpp b/engines/scumm/resource_v4.cpp
index 9d26d60184e..e35205f851f 100644
--- a/engines/scumm/resource_v4.cpp
+++ b/engines/scumm/resource_v4.cpp
@@ -146,7 +146,7 @@ void ScummEngine_v4::readIndexFile() {
 			break;
 
 		default:
-			error("Bad ID %c%c found in directory", blocktype & 0xFF, blocktype >> 8);
+			error("Bad ID %04X found in index file directory", blocktype);
 		}
 	}
 	closeRoom();