[Scummvm-git-logs] scummvm master -> 03af299b6ab258030a9969b5c6e79aec2796c357

[sluicebox]

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:
03af299b6a SCI: Use kMoveCursor in ECO1 Demo


Commit: 03af299b6ab258030a9969b5c6e79aec2796c357
    https://github.com/scummvm/scummvm/commit/03af299b6ab258030a9969b5c6e79aec2796c357
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-04-29T23:41:02-07:00

Commit Message:
SCI: Use kMoveCursor in ECO1 Demo

Fixes crash when pressing tab or arrow keys on demo dialog

Changed paths:
    engines/sci/engine/kernel.cpp


diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 073447e5aa8..e25b0bc8bfc 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -783,12 +783,15 @@ void Kernel::loadKernelNames(GameFeatures *features) {
 			_kernelNames[0x89] = "KawaHacks";
 		}
 
-		_kernelNames[0x71] = "PalVary";
-
-		// At least EcoQuest 1 demo uses kGetMessage instead of kMessage.
-		// Detect which function to use.
-		if (features->detectMessageFunctionType() == SCI_VERSION_1_1)
+		// EcoQuest 1 demo uses kGetMessage and kMoveCursor (SCI_VERSION_1_LATE)
+		// instead of kMessage and kPalVary (SCI_VERSION_1_1).
+		// Detect which functions to use from message resource version.
+		if (features->detectMessageFunctionType() == SCI_VERSION_1_1) {
+			_kernelNames[0x71] = "PalVary";
 			_kernelNames[0x7c] = "Message";
+		} else {
+			_kernelNames[0x71] = "MoveCursor";
+		}
 		break;
 
 #ifdef ENABLE_SCI32