From 4b8f4212ef6b29431991f4d9d2e509dcb1eb2174 Mon Sep 17 00:00:00 2001 From: svdijk Date: Thu, 18 May 2017 20:35:54 +0200 Subject: [PATCH] Menu: Hotkeys should only select selectable items. --- wadsrc/static/zscript/menu/listmenu.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wadsrc/static/zscript/menu/listmenu.txt b/wadsrc/static/zscript/menu/listmenu.txt index b1fbcd105..9bca2d5af 100644 --- a/wadsrc/static/zscript/menu/listmenu.txt +++ b/wadsrc/static/zscript/menu/listmenu.txt @@ -114,7 +114,7 @@ class ListMenu : Menu for(int i = mDesc.mSelectedItem + 1; i < mDesc.mItems.Size(); i++) { - if (mDesc.mItems[i].CheckHotkey(ch)) + if (mDesc.mitems[i].Selectable() && mDesc.mItems[i].CheckHotkey(ch)) { mDesc.mSelectedItem = i; MenuSound("menu/cursor"); @@ -123,7 +123,7 @@ class ListMenu : Menu } for(int i = 0; i < mDesc.mSelectedItem; i++) { - if (mDesc.mItems[i].CheckHotkey(ch)) + if (mDesc.mitems[i].Selectable() && mDesc.mItems[i].CheckHotkey(ch)) { mDesc.mSelectedItem = i; MenuSound("menu/cursor");