summaryrefslogtreecommitdiffstats
path: root/crawl-ref/docs
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-26 01:19:42 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-26 01:19:42 +0000
commitfcdae070af8fe650f7e9df51a88f622b2973a11f (patch)
tree527653de843119485bb7735b39fdd844ff7071c2 /crawl-ref/docs
parent6a38874fed2ede86cac0ca906c2fa90370432280 (diff)
downloadcrawl-ref-fcdae070af8fe650f7e9df51a88f622b2973a11f.tar.gz
crawl-ref-fcdae070af8fe650f7e9df51a88f622b2973a11f.zip
Merge r6587, keybindings. Fixes bug 2018200: macros not working with the
old 0.3.4 keymap. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6682 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/docs')
-rw-r--r--crawl-ref/docs/034_changes.txt2
-rw-r--r--crawl-ref/docs/options_guide.txt8
2 files changed, 8 insertions, 2 deletions
diff --git a/crawl-ref/docs/034_changes.txt b/crawl-ref/docs/034_changes.txt
index 0ceb44845c..6ed359420d 100644
--- a/crawl-ref/docs/034_changes.txt
+++ b/crawl-ref/docs/034_changes.txt
@@ -68,7 +68,7 @@ We are content that all of these changes are genuine improvements. Should
your brain be hardwired to the old settings, you can effectively enforce
the 0.3.4 state by using the following options:
include = 034_monster_glyphs.txt
- additional_macro_file = 034_command_keys.txt
+ include = 034_command_keys.txt
always_confirm_butcher = true
Note that the header of init.txt contains these lines. (It contains some
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index f182fed5ec..e7cb00a362 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -82,7 +82,7 @@ The contents of this text are:
autoinscribe
4-n Macro related Options.
flush.failure, flush.command, flush.message,
- macro_meta_entry, additional_macro_file
+ macro_meta_entry, additional_macro_file, bindkey
4-o Tiles Options.
tile_show_items, title_screen, tile_player_col,
tile_monster_col, tile_neutral_col, tile_friendly_col,
@@ -1470,6 +1470,12 @@ additional_macro_file = path/to/filename
Add an additional macro file to be loaded after macro.txt.
You can have multiple additional_macro_file lines.
+bindkey = [^D] CMD_BUTCHER
+ Change which key invokes which command at a lower level of
+ operation than macros. Useful in that macros cannot (yet)
+ invoke each other, but a macro can invoke a command whose
+ key has changed.
+
4-o Tiles Options.
----------------------
In non-tile games the tile options are ignored.