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

[athrxx]

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:
77890fbb9f KYRA: (LoK/Mac) - fix regression
96f81e27c1 KYRA: (LoK/PC-98) - fix regression


Commit: 77890fbb9f87c4f1fcd5bd22f0415f57e7d41abd
    https://github.com/scummvm/scummvm/commit/77890fbb9f87c4f1fcd5bd22f0415f57e7d41abd
Author: athrxx (athrxx at scummvm.org)
Date: 2023-10-19T21:26:24+02:00

Commit Message:
KYRA: (LoK/Mac) - fix regression

Changed paths:
    engines/kyra/resource/resource.cpp


diff --git a/engines/kyra/resource/resource.cpp b/engines/kyra/resource/resource.cpp
index 15fb3ee1ece..28fecbfcbbf 100644
--- a/engines/kyra/resource/resource.cpp
+++ b/engines/kyra/resource/resource.cpp
@@ -137,7 +137,7 @@ bool Resource::reset() {
 			gameDir.listMatchingMembers(files, "*.PAK");
 			gameDir.listMatchingMembers(files, "*.APK");
 
-			if (_vm->gameFlags().platform == Common::Platform::kPlatformMacintosh) {
+			if (_vm->gameFlags().platform == Common::Platform::kPlatformMacintosh && gameDir.getSubDirectory("runtime") != nullptr) {
 				gameDirRuntime.reset(gameDir.getSubDirectory("runtime"));
 				gameDirRuntime->listMatchingMembers(files, "*.PAK");
 				gameDirRuntime->listMatchingMembers(files, "*.APK");


Commit: 96f81e27c14bd6b6f7369936eed097ea33728bea
    https://github.com/scummvm/scummvm/commit/96f81e27c14bd6b6f7369936eed097ea33728bea
Author: athrxx (athrxx at scummvm.org)
Date: 2023-10-19T21:26:51+02:00

Commit Message:
KYRA: (LoK/PC-98) - fix regression

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


diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index 209fe903ac1..eed2da15ce7 100644
--- a/engines/kyra/graphics/screen.cpp
+++ b/engines/kyra/graphics/screen.cpp
@@ -200,7 +200,7 @@ bool Screen::init() {
 
 			if (_use16ColorMode)
 				_fonts[FID_SJIS_TEXTMODE_FNT] = new SJISFont(_sjisFontShared, _sjisInvisibleColor, true, false, 0);
-			else if (!(_vm->gameFlags().platform == Common::kPlatformPC98 && _vm->game() != GI_EOB2))
+			else if (_vm->gameFlags().platform != Common::kPlatformPC98 || _vm->game() != GI_EOB2)
 				_fonts[FID_SJIS_FNT] = new SJISFont(_sjisFontShared, _sjisInvisibleColor, false, _vm->game() != GI_LOL && _vm->game() != GI_EOB2, _vm->game() == GI_LOL ? 1 : 0);
 		}
 	}