[Scummvm-git-logs] scummvm master -> 812bf6770676489f005b0480d760dc7312aa8e63

[dwatteau]

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

Summary:
812bf67706 KYRA: Give the name of the original SJIS font when reporting it can't be found


Commit: 812bf6770676489f005b0480d760dc7312aa8e63
    https://github.com/scummvm/scummvm/commit/812bf6770676489f005b0480d760dc7312aa8e63
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-04-25T13:08:26+02:00

Commit Message:
KYRA: Give the name of the original SJIS font when reporting it can't be found

More helpful this way.

Tested with my own Japanese FM-TOWNS CD of Kyrandia II.

Changed paths:
    engines/kyra/graphics/screen.cpp


diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index ce69e40b88d..a11620488b8 100644
--- a/engines/kyra/graphics/screen.cpp
+++ b/engines/kyra/graphics/screen.cpp
@@ -197,9 +197,11 @@ bool Screen::init() {
 		}
 
 		if (_useSJIS) {
+			assert(_vm->gameFlags().platform == Common::kPlatformPC98 || _vm->gameFlags().platform == Common::kPlatformFMTowns);
+
 			_sjisFontShared = Common::SharedPtr<Graphics::FontSJIS>(Graphics::FontSJIS::createFont(_vm->gameFlags().platform));
 			if (!_sjisFontShared.get())
-				error("Could not load any SJIS font, neither the original nor ScummVM's 'SJIS.FNT'");
+				error("Could not load any SJIS font, neither the original %s nor ScummVM's 'SJIS.FNT'", _vm->gameFlags().platform == Common::kPlatformPC98 ? "'FONT.ROM'/'FONT.BMP'" : "'FMT_FMT.ROM'");
 
 			if (_use16ColorMode)
 				_fonts[FID_SJIS_TEXTMODE_FNT] = new SJISFont(_sjisFontShared, _sjisInvisibleColor, true, false, 0);