[2458672] Fixing level map not using CMD_MAP_* commands or going through cmd-keys.h. This will allow these commands to be remapped correctly.

Also, fixing issue where cancelling the level map help screen in tiles wouldn't go back to viewing the dungeon.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7957 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 66 insertions, 0 deletions

diff --git a/crawl-ref/source/cmd-keys.h b/crawl-ref/source/cmd-keys.h
index 44894b846c..25c212a392 100644
--- a/crawl-ref/source/cmd-keys.h
+++ b/crawl-ref/source/cmd-keys.h
@@ -209,4 +209,70 @@
 {CK_MOUSE_MOVE,  CMD_TARGET_MOUSE_MOVE},
 {CK_MOUSE_CLICK, CMD_TARGET_MOUSE_SELECT},
 
+{'?', CMD_MAP_HELP},
+{CONTROL('C'), CMD_MAP_CLEAR_MAP},
+{CONTROL('F'), CMD_MAP_FORGET},
+{CONTROL('W'), CMD_MAP_ADD_WAYPOINT},
+{'e', CMD_MAP_EXCLUDE_AREA},
+{CONTROL('E'), CMD_MAP_CLEAR_EXCLUDES},
+{'b', CMD_MAP_MOVE_DOWN_LEFT},
+{'h', CMD_MAP_MOVE_LEFT},
+{'j', CMD_MAP_MOVE_DOWN},
+{'k', CMD_MAP_MOVE_UP},
+{'l', CMD_MAP_MOVE_RIGHT},
+{'n', CMD_MAP_MOVE_DOWN_RIGHT},
+{'u', CMD_MAP_MOVE_UP_RIGHT},
+{'y', CMD_MAP_MOVE_UP_LEFT},
+{CK_END, CMD_MAP_MOVE_DOWN_LEFT},
+{CK_LEFT, CMD_MAP_MOVE_LEFT},
+{CK_DOWN, CMD_MAP_MOVE_DOWN},
+{CK_UP, CMD_MAP_MOVE_UP},
+{CK_RIGHT, CMD_MAP_MOVE_RIGHT},
+{CK_PGDN, CMD_MAP_MOVE_DOWN_RIGHT},
+{CK_PGUP, CMD_MAP_MOVE_UP_RIGHT},
+{CK_HOME, CMD_MAP_MOVE_UP_LEFT},
+{'B', CMD_MAP_JUMP_DOWN_LEFT},
+{'H', CMD_MAP_JUMP_LEFT},
+{'J', CMD_MAP_JUMP_DOWN},
+{'K', CMD_MAP_JUMP_UP},
+{'L', CMD_MAP_JUMP_RIGHT},
+{'N', CMD_MAP_JUMP_DOWN_RIGHT},
+{'U', CMD_MAP_JUMP_UP_RIGHT},
+{'Y', CMD_MAP_JUMP_UP_LEFT},
+{CK_SHIFT_END, CMD_MAP_JUMP_DOWN_LEFT},
+{CK_SHIFT_LEFT, CMD_MAP_JUMP_LEFT},
+{CK_SHIFT_DOWN, CMD_MAP_JUMP_DOWN},
+{CK_SHIFT_UP, CMD_MAP_JUMP_UP},
+{CK_SHIFT_RIGHT, CMD_MAP_JUMP_RIGHT},
+{CK_SHIFT_PGDN, CMD_MAP_JUMP_DOWN_RIGHT},
+{CK_SHIFT_PGUP, CMD_MAP_JUMP_UP_RIGHT},
+{CK_SHIFT_HOME, CMD_MAP_JUMP_UP_LEFT},
+{'+', CMD_MAP_SCROLL_DOWN},
+{CK_MOUSE_B5, CMD_MAP_SCROLL_DOWN},
+{'-', CMD_MAP_SCROLL_UP},
+{CK_MOUSE_B4, CMD_MAP_SCROLL_UP},
+{'<', CMD_MAP_FIND_UPSTAIR},
+{'>', CMD_MAP_FIND_DOWNSTAIR},
+{'@', CMD_MAP_FIND_YOU},
+{'\t', CMD_MAP_FIND_PORTAL},
+{'^', CMD_MAP_FIND_TRAP},
+{'_', CMD_MAP_FIND_ALTAR},
+{'E', CMD_MAP_FIND_EXCLUDED},
+{'F', CMD_MAP_FIND_F},
+{'W', CMD_MAP_FIND_WAYPOINT},
+{'I', CMD_MAP_FIND_STASH},
+{'*', CMD_MAP_FIND_STASH},
+{'/', CMD_MAP_FIND_STASH_REVERSE},
+{'\'', CMD_MAP_FIND_STASH},
+{'.', CMD_MAP_GOTO_TARGET},
+{'\r', CMD_MAP_GOTO_TARGET},
+{'S', CMD_MAP_GOTO_TARGET},
+{',', CMD_MAP_GOTO_TARGET},
+{';', CMD_MAP_GOTO_TARGET},
+{ESCAPE, CMD_MAP_EXIT_MAP},
+
+#ifdef WIZARD
+{'T', CMD_MAP_WIZARD_TELEPORT},
+#endif
+
 {'\0', CMD_NO_CMD}