summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/cmd-keys.h
diff options
context:
space:
mode:
authorHaran Pilpel <haranp@users.sourceforge.net>2010-01-26 21:23:19 +0200
committerHaran Pilpel <haranp@users.sourceforge.net>2010-01-26 21:23:19 +0200
commit36b2bd4d949f30fe4ab537530d2a32a3e62d25b2 (patch)
tree3b3de7554525b25e7ba4707b2f3a95c1afb328a1 /crawl-ref/source/cmd-keys.h
parent1b0e160558871212b381b3a586f00a5d74b3bf3a (diff)
parenta9242111459f37f2c4a635a7e5d05bd1c1c46ccb (diff)
downloadcrawl-ref-36b2bd4d949f30fe4ab537530d2a32a3e62d25b2.tar.gz
crawl-ref-36b2bd4d949f30fe4ab537530d2a32a3e62d25b2.zip
Merge branch 'direction-rewrite'
Conflicts: crawl-ref/source/directn.cc
Diffstat (limited to 'crawl-ref/source/cmd-keys.h')
-rw-r--r--crawl-ref/source/cmd-keys.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/cmd-keys.h b/crawl-ref/source/cmd-keys.h
index a14d36df99..e90e97f4cd 100644
--- a/crawl-ref/source/cmd-keys.h
+++ b/crawl-ref/source/cmd-keys.h
@@ -189,8 +189,7 @@
{CONTROL('F'), CMD_TARGET_CYCLE_TARGET_MODE},
{CONTROL('L'), CMD_TARGET_TOGGLE_MLIST},
{'p', CMD_TARGET_PREV_TARGET},
-{'f', CMD_TARGET_MAYBE_PREV_TARGET},
-{'t', CMD_TARGET_MAYBE_PREV_TARGET},
+{'f', CMD_TARGET_SELECT},
{'-', CMD_TARGET_CYCLE_BACK},
{'+', CMD_TARGET_CYCLE_FORWARD},
{'=', CMD_TARGET_CYCLE_FORWARD},