[Scummvm-cvs-logs] scummvm master -> 06a2ac495de588103f4c42bb03597d965965e8cf

[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:
06a2ac495d DREAMWEB: Also filter out invalid characters in getNextWord()


Commit: 06a2ac495de588103f4c42bb03597d965965e8cf
    https://github.com/scummvm/scummvm/commit/06a2ac495de588103f4c42bb03597d965965e8cf
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2012-11-05T15:47:03-08:00

Commit Message:
DREAMWEB: Also filter out invalid characters in getNextWord()

Thanks again to eriktorbjorn for spotting this. This one should be the
last place where we should filter out invalid characters

Changed paths:
    engines/dreamweb/print.cpp



diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index f5a0ed3..d9350e1 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -49,7 +49,9 @@ uint8 DreamWebEngine::getNextWord(const GraphicsFile &charSet, const uint8 *stri
 			return 0;
 		}
 		firstChar = modifyChar(firstChar);
-		if (firstChar != 255) {
+		// WORKAROUND: Also filter out invalid characters here (refer to the
+		// workaround in printChar() below for more info).
+		if (firstChar >= 32 && firstChar != 255) {
 			uint8 secondChar = *string;
 			uint8 width = charSet._frames[firstChar - 32 + _charShift].width;
 			width = kernChars(firstChar, secondChar, width);