summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2010-01-16 13:42:39 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2010-01-16 14:27:41 +0100
commita68c22639f6f3e95037b5fc1172eea2541e4c34d (patch)
tree7a3914b6b4195a213a0e1d4197d8c99e39c7c133 /crawl-ref
parent73fd97218337e3a0603c2496ed9beb5f2a4c71a4 (diff)
downloadcrawl-ref-a68c22639f6f3e95037b5fc1172eea2541e4c34d.tar.gz
crawl-ref-a68c22639f6f3e95037b5fc1172eea2541e4c34d.zip
In cmd-keys.h move vi keys further down, so they get listed in the help.
Oddly enough, if the vi keys get reassigned to something else, the help screen doesn't switch to one of the other keys. This actually suits me as someone reassigning the keys apparently has no intention of using them but already knows what they do. (It does mean, however, that reassigning another duplicate key will also not update the display.) For players using the new Dvorak settings, the Dvorak vi keys get displayed instead, which strikes me as much more useful.
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/cmd-keys.h25
1 files changed, 15 insertions, 10 deletions
diff --git a/crawl-ref/source/cmd-keys.h b/crawl-ref/source/cmd-keys.h
index e4c893a2a9..fe0c20f680 100644
--- a/crawl-ref/source/cmd-keys.h
+++ b/crawl-ref/source/cmd-keys.h
@@ -1,18 +1,16 @@
#ifndef CMD_KEYS_H
#define CMD_KEYS_H
+// If there are several keys assigned to the same command, the last one
+// will be the one displayed on the command help screen. Keys assigned
+// via keybindings will take precedence. (jpeg)
#ifdef USE_TILE
{'-', CMD_EDIT_PLAYER_TILE},
{'_', CMD_TOGGLE_SPELL_DISPLAY},
#endif
-{'b', CMD_MOVE_DOWN_LEFT},
-{'h', CMD_MOVE_LEFT},
-{'j', CMD_MOVE_DOWN},
-{'k', CMD_MOVE_UP},
-{'l', CMD_MOVE_RIGHT},
-{'n', CMD_MOVE_DOWN_RIGHT},
-{'u', CMD_MOVE_UP_RIGHT},
-{'y', CMD_MOVE_UP_LEFT},
+// movement keys
+{CK_CLEAR, CMD_MOVE_NOWHERE},
+{'.', CMD_MOVE_NOWHERE},
{CK_END, CMD_MOVE_DOWN_LEFT},
{CK_LEFT, CMD_MOVE_LEFT},
{CK_DOWN, CMD_MOVE_DOWN},
@@ -30,6 +28,15 @@
{1009, CMD_MOVE_UP_RIGHT},
{1007, CMD_MOVE_UP_LEFT},
{1005, CMD_REST},
+{'b', CMD_MOVE_DOWN_LEFT},
+{'h', CMD_MOVE_LEFT},
+{'j', CMD_MOVE_DOWN},
+{'k', CMD_MOVE_UP},
+{'l', CMD_MOVE_RIGHT},
+{'n', CMD_MOVE_DOWN_RIGHT},
+{'u', CMD_MOVE_UP_RIGHT},
+{'y', CMD_MOVE_UP_LEFT},
+// other commands
{'a', CMD_USE_ABILITY},
{'c', CMD_BUTCHER},
{'d', CMD_DROP},
@@ -83,8 +90,6 @@
{'T', CMD_REMOVE_ARMOUR},
{'W', CMD_WEAR_ARMOUR},
{'X', CMD_DISPLAY_MAP},
-{'.', CMD_MOVE_NOWHERE},
-{CK_CLEAR, CMD_MOVE_NOWHERE},
{'<', CMD_GO_UPSTAIRS},
{'>', CMD_GO_DOWNSTAIRS},
{'@', CMD_DISPLAY_CHARACTER_STATUS},