[Scummvm-git-logs] scummvm master -> 2354c9de12b21974737f6ac456d2565b7f32e7e1

[sev-]

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:
2354c9de12 WAGE: Do not error on unprintable characters.


Commit: 2354c9de12b21974737f6ac456d2565b7f32e7e1
    https://github.com/scummvm/scummvm/commit/2354c9de12b21974737f6ac456d2565b7f32e7e1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-18T19:13:22+02:00

Commit Message:
WAGE: Do not error on unprintable characters.

Makes Swamp Witch start

Changed paths:
    engines/wage/detection_tables.h
    engines/wage/script.cpp


diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index b207946..bde1078 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -158,7 +158,6 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("Star Trek", "3067332e6f0bb0314579f9bf102e1b56", 53320),
 	FANGAME("Strange Disappearance", "9d6e41b61c0fc90400e5da2fcb653a4a", 772282),
 	FANGAME("The Sultan's Palace", "fde31cbcc77b66969b4cfcd43075341e", 456855),
-	// Code 0x03 in text
 	FANGAME("Swamp Witch", "bd8c8394be31f7845d55785b7ccfbbde", 739781), // Original file name "Swamp Witch†"
 	FANGAME("Swamp Witch", "07463c8b3b908b0c493a41b949ac1ff5", 740131), // alt version, normal file name
 	FANGAME("Sweetspace Now!", "574dc7dd25543f7a516d6524f0c5ab33", 123813), // Comes with Jumble
diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
index c4cf23f..3405c8b 100644
--- a/engines/wage/script.cpp
+++ b/engines/wage/script.cpp
@@ -1161,12 +1161,19 @@ void Script::convertToText() {
 			break;
 
 		if (c < 0x80) {
-			if (c < 0x20)
-				error("convertToText: Unknown code 0x%02x at %d", c, _data->pos());
+			if (c < 0x20) {
+				warning("convertToText: Unknown code 0x%02x at %d", c, _data->pos());
+				c = ' ';
+			}
 
 			do {
 				scr->line += c;
 				c = _data->readByte();
+
+				if (c < 0x20) {
+					warning("convertToText: Unknown code 0x%02x at %d", c, _data->pos());
+					c = ' ';
+				}
 			} while (c < 0x80);
 
 			_data->seek(-1, SEEK_CUR);