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

athrxx noreply at scummvm.org
Thu Oct 22 20:01:11 UTC 2026


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:
e0ddc60bfa KYRA: (LOK/Floppy) - fix bug no. 17421


Commit: e0ddc60bfabb1efdf1e135006c8914ca59d0596c
    https://github.com/scummvm/scummvm/commit/e0ddc60bfabb1efdf1e135006c8914ca59d0596c
Author: athrxx (athrxx at scummvm.org)
Date: 2026-10-22T21:59:09+02:00

Commit Message:
KYRA: (LOK/Floppy) - fix bug no. 17421

Changed paths:
    engines/kyra/script/script_lok.cpp


diff --git a/engines/kyra/script/script_lok.cpp b/engines/kyra/script/script_lok.cpp
index d27145dfc5a..44e783e7af8 100644
--- a/engines/kyra/script/script_lok.cpp
+++ b/engines/kyra/script/script_lok.cpp
@@ -1265,11 +1265,10 @@ int KyraEngine_LoK::o1_setFireberryGlowPalette(EMCState *script) {
 		}
 
 		if (_brandonStatusBit & 2) {
-			if (_currentCharacter->sceneId != 133 && _currentCharacter->sceneId != 137 &&
-			        _currentCharacter->sceneId != 165 && _currentCharacter->sceneId != 173 &&
-			        (_currentCharacter->sceneId < 187 || _currentCharacter->sceneId > 198)) {
-				palIndex = 14;
-			}
+			if ((!(_flags.isTalkie || _flags.platform == Common::kPlatformMacintosh || _flags.platform == Common::kPlatformFMTowns) ||
+				(_currentCharacter->sceneId != 133 && _currentCharacter->sceneId != 137 && _currentCharacter->sceneId != 165 && _currentCharacter->sceneId != 173)) &&
+					(_currentCharacter->sceneId < 187 || _currentCharacter->sceneId > 198))
+						palIndex = 14;
 		}
 
 		_screen->getPalette(1).copy(_specialPalettes[palIndex], 0, 15, 228);




More information about the Scummvm-git-logs mailing list