From 4790773ec2f13e1d5ce10c61ffbf2ddc38038d9c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 4 Oct 2020 19:39:37 +0200 Subject: [PATCH] - script update for key bindings. --- wadsrc/static/zscript/ui/menu/menu.zs | 3 +++ wadsrc/static/zscript/ui/menu/optionmenuitems.zs | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/wadsrc/static/zscript/ui/menu/menu.zs b/wadsrc/static/zscript/ui/menu/menu.zs index d47af6fc2..65a563211 100644 --- a/wadsrc/static/zscript/ui/menu/menu.zs +++ b/wadsrc/static/zscript/ui/menu/menu.zs @@ -2,8 +2,11 @@ struct KeyBindings native version("2.4") { native static String NameKeys(int k1, int k2); + native static String NameAllKeys(array list); native int, int GetKeysForCommand(String cmd); + native void GetAllKeysForCommand(out array list, String cmd); + native void SetBind(int key, String cmd); native void UnbindACommand (String str); } diff --git a/wadsrc/static/zscript/ui/menu/optionmenuitems.zs b/wadsrc/static/zscript/ui/menu/optionmenuitems.zs index 799d6b455..95a27d055 100644 --- a/wadsrc/static/zscript/ui/menu/optionmenuitems.zs +++ b/wadsrc/static/zscript/ui/menu/optionmenuitems.zs @@ -502,14 +502,14 @@ class OptionMenuItemControlBase : OptionMenuItem //============================================================================= override int Draw(OptionMenuDescriptor desc, int y, int indent, bool selected) { - drawLabel(indent, y, mWaiting? OptionMenuSettings.mFontColorHighlight: - (selected? OptionMenuSettings.mFontColorSelection : OptionMenuSettings.mFontColor)); + drawLabel(indent, y, mWaiting ? OptionMenuSettings.mFontColorHighlight : + (selected ? OptionMenuSettings.mFontColorSelection : OptionMenuSettings.mFontColor)); String description; - int Key1, Key2; + Array keys; - [Key1, Key2] = mBindings.GetKeysForCommand(mAction); - description = KeyBindings.NameKeys (Key1, Key2); + mBindings.GetAllKeysForCommand(keys, mAction); + description = KeyBindings.NameAllKeys(keys); if (description.Length() > 0) { drawValue(indent, y, Font.CR_WHITE, description);