Track what keys in the macro buffer have been expanded.

This should fix problems where expanded keys were re-expanded,
e.g. #1226.

It's still really messy, and macro.cc:Buffer should eventually
be replaced by something better, either a queue that explicitly
distinguishes the types of things it contains (raw key, expanded
key, etc), or separate containers for different kinds of keys.

1 files changed, 4 insertions, 2 deletions

diff --git a/crawl-ref/source/macro.h b/crawl-ref/source/macro.h
index ddcc1612da..41da79d3a3 100644
--- a/crawl-ref/source/macro.h
+++ b/crawl-ref/source/macro.h
@@ -48,8 +48,10 @@ void macro_save();
 
 void macro_userfn(const char *keys, const char *registryname);
 
-void macro_buf_add(int key, bool reverse = false);
-void macro_buf_add(const keyseq &actions, bool reverse = false);
+void macro_buf_add(int key,
+                   bool reverse = false, bool expanded = true);
+void macro_buf_add(const keyseq &actions,
+                   bool reverse = false, bool expanded = true);
 int macro_buf_get();
 
 void macro_buf_add_cmd(command_type cmd, bool reverse = false);