[Scummvm-git-logs] scummvm master -> ae22e10589e372de3d5c1e8495b7627683c6049b

[athrxx]

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:
ae22e10589 KYRA: (LOK/CD + Amiga) - fix bug no. 13740 (Game crashes when trying to read the note)


Commit: ae22e10589e372de3d5c1e8495b7627683c6049b
    https://github.com/scummvm/scummvm/commit/ae22e10589e372de3d5c1e8495b7627683c6049b
Author: athrxx (athrxx at scummvm.org)
Date: 2022-08-01T18:58:02+02:00

Commit Message:
KYRA: (LOK/CD + Amiga) - fix bug no. 13740 (Game crashes when trying to read the note)

Changed paths:
    engines/kyra/engine/kyra_lok.cpp


diff --git a/engines/kyra/engine/kyra_lok.cpp b/engines/kyra/engine/kyra_lok.cpp
index f45de68ff05..dac0ecc7f17 100644
--- a/engines/kyra/engine/kyra_lok.cpp
+++ b/engines/kyra/engine/kyra_lok.cpp
@@ -96,7 +96,7 @@ KyraEngine_LoK::KyraEngine_LoK(OSystem *system, const GameFlags &flags)
 	_malcolmFrame = 0;
 	_malcolmTimer1 = _malcolmTimer2 = 0;
 	_defaultFont = Screen::FID_8_FNT;
-	_noteFont = Screen::FID_6_FNT;
+	_noteFont = (_flags.isTalkie || flags.platform == Common::kPlatformAmiga) ? _defaultFont : Screen::FID_6_FNT;
 	_defaultLineSpacing = 0;
 
 	switch (_flags.lang) {