[Scummvm-git-logs] scummvm master -> 3b44f7b329514ff3428f691c2b480355666623ca

[dreammaster]

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:
3b44f7b329 GLK: COMPREHEND: Support starting if-archive Talisman version


Commit: 3b44f7b329514ff3428f691c2b480355666623ca
    https://github.com/scummvm/scummvm/commit/3b44f7b329514ff3428f691c2b480355666623ca
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-15T21:23:50-08:00

Commit Message:
GLK: COMPREHEND: Support starting if-archive Talisman version

Changed paths:
    engines/glk/comprehend/charset.cpp
    engines/glk/comprehend/game_tm.cpp


diff --git a/engines/glk/comprehend/charset.cpp b/engines/glk/comprehend/charset.cpp
index 04f4eac534..2731121a47 100644
--- a/engines/glk/comprehend/charset.cpp
+++ b/engines/glk/comprehend/charset.cpp
@@ -74,7 +74,7 @@ TalismanFont::TalismanFont() : FixedFont() {
 
 	Common::String md5 = Common::computeStreamMD5AsString(f, 1024);
 
-	if (md5 == "0e7f002971acdb055f439020363512ce") {
+	if (md5 == "0e7f002971acdb055f439020363512ce" || md5 == "2e18c88ce352ebea3e14177703a0485f") {
 		for (int idx = 0; idx < 128 - 32; ++idx)
 			f.read(&_data[idx][0], 8);
 	} else {
diff --git a/engines/glk/comprehend/game_tm.cpp b/engines/glk/comprehend/game_tm.cpp
index 891d4ef26f..0c6f8dbfff 100644
--- a/engines/glk/comprehend/game_tm.cpp
+++ b/engines/glk/comprehend/game_tm.cpp
@@ -63,7 +63,7 @@ void TalismanGame::loadStrings() {
 		error("novel.exe is a required file");
 
 	Common::String md5 = Common::computeStreamMD5AsString(f, 1024);
-	if (md5 != "0e7f002971acdb055f439020363512ce")
+	if (md5 != "0e7f002971acdb055f439020363512ce" && md5 != "2e18c88ce352ebea3e14177703a0485f")
 		error("Unrecognised novel.exe encountered");
 
 	const int STRING_SEGMENTS[2] = { STRINGS_SEGMENT1, STRINGS_SEGMENT2 };