[Scummvm-cvs-logs] scummvm master -> 6a53c7cac10294d022e3eb5d47142ad46ef29bd9

[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:
6a53c7cac1 ZVISION: Ignore the special 0xCCCC character in subtitles


Commit: 6a53c7cac10294d022e3eb5d47142ad46ef29bd9
    https://github.com/scummvm/scummvm/commit/6a53c7cac10294d022e3eb5d47142ad46ef29bd9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-23T01:45:44+02:00

Commit Message:
ZVISION: Ignore the special 0xCCCC character in subtitles

This seems to be used as a newline character

Changed paths:
    engines/zvision/text/text.cpp



diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 08b5791..4ea40a1 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -495,7 +495,7 @@ Common::String readWideLine(Common::SeekableReadStream &stream) {
 		} else if (value >= 0x80 && value < 0x800) {
 			asciiString += (char)(0xC0 | ((value >> 6) & 0x1F));
 			asciiString += (char)(0x80 | (value & 0x3F));
-		} else if (value >= 0x800 && value < 0x10000) {
+		} else if (value >= 0x800 && value < 0x10000 && value != 0xCCCC) {
 			asciiString += (char)(0xE0 | ((value >> 12) & 0xF));
 			asciiString += (char)(0x80 | ((value >> 6) & 0x3F));
 			asciiString += (char)(0x80 | (value & 0x3F));