diff options
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/macro.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/macro.h | 3 | ||||
-rw-r--r-- | crawl-ref/source/menu.cc | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc index 74e294c4d7..2f2ad22ff3 100644 --- a/crawl-ref/source/macro.cc +++ b/crawl-ref/source/macro.cc @@ -641,8 +641,10 @@ int getchm(KeymapContext mc, int (*rgetch)()) // Read some keys... keyseq keys = getch_mul(rgetch); - // ... and add them into the buffer - macro_buf_add_long( keys, Keymaps[mc] ); + if (mc == KC_NONE) + macro_buf_add(keys); + else + macro_buf_add_long(keys, Keymaps[mc]); return (macro_buf_get()); } diff --git a/crawl-ref/source/macro.h b/crawl-ref/source/macro.h index 90d0557cda..1405cb7e19 100644 --- a/crawl-ref/source/macro.h +++ b/crawl-ref/source/macro.h @@ -29,7 +29,8 @@ enum KeymapContext { KC_TARGETING, // Only during 'x' and other targeting modes KC_CONFIRM, // When being asked y/n/q questions - KC_CONTEXT_COUNT // Must always be the last + KC_CONTEXT_COUNT, // Must always be the last real context + KC_NONE // Don't apply any keymaps (for menus) }; class key_recorder; diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 82e43a0a76..3418517ea8 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -214,7 +214,7 @@ void Menu::do_menu() TileRedrawInv(REGION_INV2); mouse_control mc(MOUSE_MODE_COMMAND); #endif - int keyin = getchm(c_getch); + int keyin = getchm(KC_NONE, c_getch); if (!process_key( keyin )) return; |