summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/macro.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/macro.cc')
-rw-r--r--crawl-ref/source/macro.cc19
1 files changed, 14 insertions, 5 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index 0deb31ae04..264958a993 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -63,6 +63,7 @@ static macromap *all_maps[] =
&Keymaps[KC_DEFAULT],
&Keymaps[KC_LEVELMAP],
&Keymaps[KC_TARGETING],
+ &Keymaps[KC_CONFIRM],
&Macros,
};
@@ -661,7 +662,9 @@ void macro_add_query( void )
KeymapContext keymc = KC_DEFAULT;
mesclr();
- mpr("(m)acro, keymap [(k) default, (x) level-map or (t)argeting], (s)ave?",
+ mpr("(m)acro, keymap "
+ "[(k) default, (x) level-map, (t)argeting, (c)onfirm], "
+ "(s)ave?",
MSGCH_PROMPT);
input = m_getch();
input = tolower( input );
@@ -680,6 +683,11 @@ void macro_add_query( void )
keymap = true;
keymc = KC_TARGETING;
}
+ else if (input == 'c')
+ {
+ keymap = true;
+ keymc = KC_CONFIRM;
+ }
else if (input == 'm')
keymap = false;
else if (input == 's')
@@ -698,10 +706,11 @@ void macro_add_query( void )
macromap &mapref = (keymap ? Keymaps[keymc] : Macros);
mprf(MSGCH_PROMPT, "Input %s%s trigger key: ",
- keymap ? (keymc == KC_DEFAULT ? "default " :
- keymc == KC_LEVELMAP ? "level-map "
- : "targeting ")
- : "",
+ keymap ? (keymc == KC_DEFAULT ? "default " :
+ keymc == KC_LEVELMAP ? "level-map " :
+ keymc == KC_TARGETING ? "targeting " :
+ keymc == KC_CONFIRM ? "confirm " :
+ "buggy") : "",
(keymap ? "keymap" : "macro") );
keyseq key = getch_mul();