From 12fca19d59bed1a820ca470d6c6b69d8541eab4e Mon Sep 17 00:00:00 2001 From: sluicebox Date: Tue, 19 Nov 2019 19:52:16 -0800 Subject: SCI: Fix kMenuSelect selecting disabled items Fixes CAMELOT "draw sword" command causing bugs and lockups when it's not supposed to be available --- engines/sci/graphics/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/sci/graphics/menu.cpp') diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp index 8f6cfa1244..25d9edabe6 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) { -- cgit v1.2.3