[Scummvm-git-logs] scummvm master -> 0069281c0901d194035c937d221a1386d1fe8386

[bluegr]

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:
0069281c09 SCI: Fix SQ4CD hintbook text layout


Commit: 0069281c0901d194035c937d221a1386d1fe8386
    https://github.com/scummvm/scummvm/commit/0069281c0901d194035c937d221a1386d1fe8386
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-08-12T09:27:35+03:00

Commit Message:
SCI: Fix SQ4CD hintbook text layout

Fixes #11070

Changed paths:
    engines/sci/engine/message.cpp


diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index dbb9362..6af207a 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -453,9 +453,14 @@ Common::String MessageState::processString(const char *s, uint32 maxLength) {
 	uint index = 0;
 
 	while (index < inStr.size() && index < maxLength) {
-		// Check for hex escape sequence
-		if (stringHex(outStr, inStr, index))
-			continue;
+		// Check for hex escape sequence.
+		//  SQ4CD predates this interpreter feature but has a message on the
+		//  hintbook screen which appears to contain hex strings and renders
+		//  incorrectly if converted, so exclude it. Fixes #11070
+		if (g_sci->getGameId() != GID_SQ4) {
+			if (stringHex(outStr, inStr, index))
+				continue;
+		}
 
 		// Check for literal escape sequence
 		if (stringLit(outStr, inStr, index))