summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/cmd-keys.h
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-03 16:17:52 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-03 16:17:52 +0000
commit5511b48771d9a12e3e622e375220091cf94023dd (patch)
treee5c031833bd5c88b0fbeb120667d66fc05a5e83b /crawl-ref/source/cmd-keys.h
parentae0c5cb4ea464e174d3ff287532d316d32b9df24 (diff)
downloadcrawl-ref-5511b48771d9a12e3e622e375220091cf94023dd.tar.gz
crawl-ref-5511b48771d9a12e3e622e375220091cf94023dd.zip
* Make movement restrictions when beheld also apply to blinking and
controlled teleport. * Highlight restricted grids when beheld (ASCII only): - main screen: restricted grids in LOS are darkgrey - X screen: unrestricted grids in view around the mermaid(s) are lightgrey * switch xx command back to leaving examine mode git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7105 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/cmd-keys.h')
-rw-r--r--crawl-ref/source/cmd-keys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/cmd-keys.h b/crawl-ref/source/cmd-keys.h
index ca2db8e120..5fe8909a75 100644
--- a/crawl-ref/source/cmd-keys.h
+++ b/crawl-ref/source/cmd-keys.h
@@ -130,6 +130,7 @@
{CONTROL('X'), CMD_SAVE_GAME_NOW},
{CONTROL('Z'), CMD_SUSPEND_GAME},
{ESCAPE, CMD_TARGET_CANCEL},
+{'x', CMD_TARGET_CANCEL},
#ifdef WIZARD
{'F', CMD_TARGET_WIZARD_MAKE_FRIENDLY},
{'P', CMD_TARGET_WIZARD_BLESS_MONSTER},
@@ -141,7 +142,6 @@
{'M', CMD_TARGET_WIZARD_MISCAST},
#endif
{'v', CMD_TARGET_DESCRIBE},
-{'x', CMD_TARGET_ALL_DESCRIBE},
{'?', CMD_TARGET_HELP},
{' ', CMD_TARGET_SELECT}, // XXX hack: can also be CMD_TARGET_CANCEL
{CONTROL('P'), CMD_TARGET_SHOW_PROMPT},