[Scummvm-git-logs] scummvm master -> 96c5f721dbf24937a10b58c87d14b57c20d985bc

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
44fbf427ef SCUMM: Added support for Japanese Mac Dig
96c5f721db NEWS: Mention Jap Mac Dig support


Commit: 44fbf427ef2ed809227eac9aa36cf6f223c2ef2c
    https://github.com/scummvm/scummvm/commit/44fbf427ef2ed809227eac9aa36cf6f223c2ef2c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-06-11T12:31:32+02:00

Commit Message:
SCUMM: Added support for Japanese Mac Dig

Changed paths:
    devtools/scumm-md5.txt
    engines/scumm/charset.cpp
    engines/scumm/scumm-md5.h


diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 38e84fa5ea..032503bf25 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -394,6 +394,7 @@ dig	The Dig
 	ebdd2fbc995a321605375dc57766db79	16304	ru	All	-	With Subtitles	-	sev
 	35a2d3040fa512f8232d9e443319d84d	659335495	en	Mac	-	-	Mac bundle	Fingolfin
 	21a6592322f92550f144f68a8a4e685e	-1	fr	Mac	-	-	Mac bundle	kaminari
+	92887c157dc7e5d637937c1069481f55	659863292	jp	Mac	-	-	Max bundle	sev
 
 	362c1d281fb9899254cda66ad246c66a	3472	en	All	Demo	Demo	-	Fingolfin
 	cd9c05e755d7bf8e9b9590ad1ebe273e	45156007	en	Mac	Demo	Demo	Mac bundle	Fingolfin
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index af4aae06bd..4e3f6610bd 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -23,6 +23,7 @@
 #include "common/macresman.h"
 
 #include "scumm/charset.h"
+#include "scumm/file.h"
 #include "scumm/scumm.h"
 #include "scumm/nut_renderer.h"
 #include "scumm/util.h"
@@ -64,7 +65,7 @@ void ScummEngine::loadCJKFont() {
 		return;
 	}
 
-	Common::File fp;
+	ScummFile fp;
 
 	if (_game.version <= 5 && _game.platform == Common::kPlatformFMTowns && _language == Common::JA_JPN) { // FM-TOWNS v3 / v5 Kanji
 #if defined(DISABLE_TOWNS_DUAL_LAYER_MODE) || !defined(USE_RGB_COLOR)
@@ -130,7 +131,7 @@ void ScummEngine::loadCJKFont() {
 		default:
 			break;
 		}
-		if (fontFile && fp.open(fontFile)) {
+		if (fontFile && openFile(fp, fontFile)) {
 			debug(2, "Loading CJK Font");
 			_useCJKMode = true;
 			_textSurfaceMultiplier = 1; // No multiplication here
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index a7edca47c6..d7108fcb4e 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Sun Jun  6 22:18:20 2021
+  This file was generated by the md5table tool on Thu Jun 10 23:02:38 2021
   DO NOT EDIT MANUALLY!
  */
 
@@ -449,6 +449,7 @@ static const MD5Table md5table[] = {
 	{ "91469353f7be1b122fa88d23480a1320", "zak", "V2", "V2", -1, Common::FR_FRA, Common::kPlatformAmiga },
 	{ "91d5db93187fab54d823f73bd6441cb6", "maniac", "NES", "", -1, Common::EN_USA, Common::kPlatformNES },
 	{ "927a764615c7fcdd72f591355e089d8c", "monkey", "No AdLib", "EGA", -1, Common::DE_DEU, Common::kPlatformAtariST },
+	{ "92887c157dc7e5d637937c1069481f55", "dig", "", "", 659863292, Common::JA_JPN, Common::kPlatformMacintosh },
 	{ "92b078d9d6d9d751da9c26b8b3075779", "tentacle", "Floppy", "Floppy", -1, Common::FR_FRA, Common::kPlatformDOS },
 	{ "92e7727e67f5cd979d8a1070e4eb8cb3", "puttzoo", "HE 98.5", "Updated", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "92fc0073a4cf259ff36070ecb8628ba8", "thinkerk", "", "", -1, Common::EN_USA, Common::kPlatformUnknown },


Commit: 96c5f721dbf24937a10b58c87d14b57c20d985bc
    https://github.com/scummvm/scummvm/commit/96c5f721dbf24937a10b58c87d14b57c20d985bc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-06-11T12:31:32+02:00

Commit Message:
NEWS: Mention Jap Mac Dig support

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 86569d1443..868e6a1eec 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -101,6 +101,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Added optional trimming to 200 pixels for some FM-TOWNS games, so aspect-ratio correction is possible.
    - Fixed audio distortion in Loom for PC-Engine.
    - Added support for the high resolution font and cursor in the Macintosh version of Loom.
+   - Added support for Japanese Mac version of The Dig.
 
  Tinsel:
    - Enabled the Return to Launcher feature.