diff options
| -rw-r--r-- | crawl-ref/source/cmd-keys.h | 17 | ||||
| -rw-r--r-- | crawl-ref/source/directn.cc | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/crawl-ref/source/cmd-keys.h b/crawl-ref/source/cmd-keys.h index 9932d5cf2b..892353d2f5 100644 --- a/crawl-ref/source/cmd-keys.h +++ b/crawl-ref/source/cmd-keys.h @@ -196,6 +196,15 @@ {CK_PGDN, CMD_TARGET_DOWN_RIGHT}, {CK_PGUP, CMD_TARGET_UP_RIGHT}, {CK_HOME, CMD_TARGET_UP_LEFT}, +{1001, CMD_TARGET_DOWN_LEFT}, +{1004, CMD_TARGET_LEFT}, +{1002, CMD_TARGET_DOWN}, +{1008, CMD_TARGET_UP}, +{1006, CMD_TARGET_RIGHT}, +{1003, CMD_TARGET_DOWN_RIGHT}, +{1009, CMD_TARGET_UP_RIGHT}, +{1007, CMD_TARGET_UP_LEFT}, +{1005, CMD_TARGET_SELECT}, {'B', CMD_TARGET_DIR_DOWN_LEFT}, {'H', CMD_TARGET_DIR_LEFT}, {'J', CMD_TARGET_DIR_DOWN}, @@ -240,6 +249,14 @@ {CK_PGDN, CMD_MAP_MOVE_DOWN_RIGHT}, {CK_PGUP, CMD_MAP_MOVE_UP_RIGHT}, {CK_HOME, CMD_MAP_MOVE_UP_LEFT}, +{1001, CMD_MAP_MOVE_DOWN_LEFT}, +{1004, CMD_MAP_MOVE_LEFT}, +{1002, CMD_MAP_MOVE_DOWN}, +{1008, CMD_MAP_MOVE_UP}, +{1006, CMD_MAP_MOVE_RIGHT}, +{1003, CMD_MAP_MOVE_DOWN_RIGHT}, +{1009, CMD_MAP_MOVE_UP_RIGHT}, +{1007, CMD_MAP_MOVE_UP_LEFT}, {'B', CMD_MAP_JUMP_DOWN_LEFT}, {'H', CMD_MAP_JUMP_LEFT}, {'J', CMD_MAP_JUMP_DOWN}, diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 0aad26a41d..6eaa8913ac 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -317,7 +317,7 @@ static void _direction_again(dist& moves, targeting_type restricts, moves.isEndpoint = false; moves.choseRay = false; - if (you.prev_targ == MHITNOT && you.prev_grd_targ == coord_def(0, 0)) + if (you.prev_targ == MHITNOT && you.prev_grd_targ.origin()) { moves.isCancel = true; crawl_state.cancel_cmd_repeat(); |