[Scummvm-git-logs] scummvm master -> 12fca19d59bed1a820ca470d6c6b69d8541eab4e

[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:
12fca19d59 SCI: Fix kMenuSelect selecting disabled items


Commit: 12fca19d59bed1a820ca470d6c6b69d8541eab4e
    https://github.com/scummvm/scummvm/commit/12fca19d59bed1a820ca470d6c6b69d8541eab4e
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-11-19T19:56:01-08:00

Commit Message:
SCI: Fix kMenuSelect selecting disabled items

Fixes CAMELOT "draw sword" command causing bugs and
lockups when it's not supposed to be available

Changed paths:
    engines/sci/graphics/menu.cpp


diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp
index 8f6cfa1..25d9eda 100644
--- a/engines/sci/graphics/menu.cpp
+++ b/engines/sci/graphics/menu.cpp
@@ -464,7 +464,7 @@ reg_t GfxMenu::kernelSelect(reg_t eventObject, bool pauseSound) {
 		while (itemIterator != itemEnd) {
 			itemEntry = *itemIterator;
 
-			if (!itemEntry->saidVmPtr.isNull()) {
+			if (!itemEntry->saidVmPtr.isNull() && itemEntry->enabled) {
 				byte *saidSpec = _segMan->derefBulkPtr(itemEntry->saidVmPtr, 0);
 
 				if (!saidSpec) {